Rewrite some other rules to use Strongly Typed AST