Expand Choice token normalization + make generic
#2796
Merged
Choice token normalization + make generic
#2796