Fixed extra spaces in match/set values.