[Reviewer: Matt] Fix compiler warnings.

These annoyed me too much so I fixed them. Matt - please can you review?