Revert "Simplified Choose."

This reverts commit b04d9abab0936bbc1284fd92b6d9bb678ee7bbc7.

Thought better of it.  The original was better, since it
reflects that there must always be an if clause.