it's probably time for some C++0x cleanups