Compiling under C++11, minor cleanups