Fix warnings about changing types on assignment.

Testing Done:
Compiled only.

Reviewed at https://reviews.imfreedom.org/r/786/