Small cleanup, and fixes compilation under GCC.