Clean up new batch functionality in escaping functions.