Cleanup and syntax fixes.