Remaining 'sanity-preservation' from C++11 adventure.