Replace match_token! proc macro with tag! macro_rules macro

Replace match_token! proc macro with tag! macro_rules macro #696