Fixed #22950 -- Eased markup customization for choice field rendering

Thanks Patrick Robertson for the report.