Changes in pattern matchers to allow group matching.