Better regexps.
Developer's commit.