Minor refactoring of the abstract builder class in generators.
Merge remote-tracking branch 'origin/master'