Fix compilation?
Remove C++03 compat hacks.