Use `Self` in enum matches
Use `Self` in enum matches

Replaces unnecessary repetitions of enum names when a replacement with
`Self` is applicable.

Missing bits from #1975

Flat/serenity,acdenisSK/serenity