New rewrite rules