Making options consistent with machineshop.