coverity_falsepos 234 B

1234
  1. o Code simplification and refactoring:
  2. - Refactor several places in our code that coverity incorrectly believed
  3. that we might have memory leaks, so that we can analyze our software
  4. more easily. Closes ticket 30147.