Clean up and fix build.
David Alda.