Partially revert my previous commit eb4cbea6
"Silence some conversion warnings", since no warning was really raised for
these obvious conversions.

Change-Id: Ie035655cdc56ceeb12a6141b168f7e9a8b863fee