Builds on latest 0.11-pre (and 0.10)

Just a straightforward fixup of syntax and warnings.