*8879* Make escaping consistent