Fix whitespace issues reported by qstools