Yet more C++03 progress.