Do faster expansion on rewrites