cleanup generator interface as in 4306
Merge pull request #4360 from civanch/forwardport_gen

cleanup generator interface as in 4306