Tweak code style a little more: add more escaping and make the default value for...