Aaron Bentley has voted tweak. Status is now: Conditionally approved Comment: This seems okay, but I think you can remove the comments about "when escaping is moved to the serialiser..." For details, see: http://bundlebuggy.aaronbentley.com/project/bzr/request/%3C4A2DB4EC.20708%40samba.org%3E Project: Bazaar