Working on generator code clean-up.