Properly support maps in match_specs