  o Code simplifications and refactoring:
    - Remove some dead code spotted by coverity. Fixes cid 432.
      Bugfix on 0.2.3.1-alpha, closes bug 4637.
