2620 - pattern-matching literals in def/mac

Ugly, ugly impl.