Tweak escaping

Again for #23, to make it the same as proposed in the upstream package.