Also drop a no longer needed [DecidableEq _] argument in 1 lemma. It was needed to generate a computable Fintype (Set.range _) instance but a Finite instance doesn't need it.
[DecidableEq _]
Fintype (Set.range _)
Finite