Now the code builds, at least on MacOSX.