Quick edits. Now it should compile cleanly.