Fix C++03 compile failures for previous commit.