Generator improvements and cleanup

No match.