Changed ordering of rewrites