Minor changes, but expression rewriting is working!