cleaner syntax-- uses refactored version of GeneratorFactory.
Fixed invalid case for module helper.