Fix up extra whitespaces in match patterns

Detected by new internal check.