This PR tries to remove from functional induction principles hypotheses that have been matched, as we expect the corresponding pattern to be more useful. This avoids duplicate hypotheses due to the way `match` refines hypotheses. Fixes #6281.
