bug 1138: Add quite some instances of mising escaping