Yet more assorted escaping fixes