The changes are probably necessary because rewrite now tries harder not to
instantiate evars, which it always said it would not do.