Lots of cleanup of the syntax generator.