Moving to full generation.
Added setOptionType for OR constructors.