MDL-3034 mod_choice: minor tidy up