Remove C-isms that confuse g++ 4.6.3.

#643