am 267030dd: Cleanup casts.

* commit '267030dd82a6165ca56899d2988b5dc51ebea104':
  Cleanup casts.