Adding better rewrite in the default sanitizer