gh-8: Improved refactoring and renaming of line generator functions.
gh-8: More refactoring in preparation for further lineGen tests.