Remove unused import
Remove stray pipe tests
Remove '-Expr' suffix from Expr variants
Update comment
Use refs in match patterns