Bug 973710 - Fix compile errors for pedantic SOB compilers and WAE. r=bustage