Additional cleanup and remove explicit C++11 usage.