Fixing several spacing issues within type casts