Fix up all of the rewriteCleanEscape instances