Moving to C++03