Getting rid of some compiler warnings. Probably doesn't need tagging.
@blam @chriadam
This will create a new commit in order to revert the existing changes.
