Minor tweaks to the new StatefulChoice functions.