Rework escaping to be more consistent.