Update to new escape_utils