More changes for rewrite-rules