Removed some more casts.