Try to appease g++ 4.6.3.

Hopefully takes care of remaining build issues in #643.