Simpify typedefs for generator