Merge "Fix whitespace issues after casts."