Safer scoping rules in ``!Choice``