Pre=C++11 fixup.