Bug 982275 - Followup: Fix some compiler warnings that were errors on gcc. r=bustage