[mcs] More tweaks to conditional tokenizer. Fixes #23319