More consistent usage of MessageFormatter::tokenizePattern