Fix additional whitespace issues reported by qstools