Fix two bugs in C++03 / single-threaded modes.