Reorder generator methods using the new placeholders
Upgrade subgenerator bash