rework escaping to act directly against the buffer