Cleanup some useless casts pt. 2