Merge "Deal with quoted subformat patterns correctly."