Modified: match and match-all macros in RegexPackage.