am cf4c7bdd: Merge "Fix whitespace issues after casts."

* commit 'cf4c7bdd1c108345596ebf77ab9c853da9235de5':
  Fix whitespace issues after casts.