Fixup and use new match-a-pattern macro in Redex