Some fixups in refine.cc

Christoph Grüningerrequested to merge
feature/refine-cleanup into master

Most fixup where directly or indirectly triggered by Cppcheck

Merge request reports