Problem: Some generator scripts are still inconsistent

Solution: fix the inconsistencies.

I would have liked to submit these each as a separate PR, but they touch the same files and would have merge conflicts to sort through.  However, each commit does address a single specific issue.