Bug 232413 - remove occurrences of   in favour of [%+ construct to prevent whitespace chomping. Patch by gerv; r=kiko, a=justdave.