Ensure variants with arbitrary values and a modifier are correctly matched in the RegEx based parser#12179