Fix escape_ methods. (leftovers)

Signed-off-by: Norv <a.w.norv@gmail.com>
Merge pull request #420 from norv/fixes

Fix escape_ methods