Change casts from old style to new style. This helps document the details