Small refactoring for generators: control flow generator was separated from general one