Use AUTOGENERATE_ constants rather than boolean