minor Generator refactoring
minor Generator refactoring


Former-commit-id: cbbc479c56d2f2ba4215f21b2f3ae408ad0bc5f6
Trass3r/Halide,Trass3r/Halide,darkbuck/Halide,Trass3r/Halide,darkbuck/Halide,darkbuck/Halide,Trass3r/Halide,Trass3r/Halide,Trass3r/Halide,darkbuck/Halide,darkbuck/Halide,Trass3r/Halide,darkbuck/Halide,darkbuck/Halide