More progress on C++-03 compatibility.