More work on the new expression rewrite system