* matcher/unit_matcher.ml: less functions to pass around