Fix up the @choose dsl