More cleanup and syntax fixes.