Fix return type generators.