Compilation fixes for gcc 4.9.1

Fixes required to compile without warnings on gcc 4.9.1.  Please excuse my Emacs' habit of removing trailing whitespace.