MDL-43770 mod_choice: Address coding style issues identified by CiBoT