Fix #696: Reenable plugin generator and update generated files

During a previous refactoring an error had been introduced that did not enable
the plugin tasks. I have reenabled the tasks and updated the GenerateCommand
to match the new coding standards and fix any bugs that were contained in it.