Make regenerator argument more consistent