Now compiles with g++.