Fix up extra whitespaces in match patterns

Detected by new internal check.
Merge branch 'master' into travis_glibcxxdebug