Greedy/non-greedy fixes to other matchers

(Yes, I know this needs a massive refactor.)