Added support for match expression

The lesson I learned: if there's only one rule in another rule, don't
define the rewrite method