Upgrade to latest core.match

The newer releases switch to using :guard to denote predicates inside a
match clause.