Get rid of some useless casts pt. 2