You could use a partial function directly (no need for `p => p match ..`). Just sayin'