tweak to raw/esc methods to see if it caused performance regression