Eta reduction
Use ad hoc matching on dive shape category

Makes the code cleaner and prettier, even if it’s not true matching. It
‘matches’ against a condition, not a value.