Simplify the option and property choice types