Extend DSL syntax to capture option choice specifications; still need to generate code for default choices.