Syntax fixes and a few little lint fixes.