WyRL: still working on simplifying the rewrite system