coverity_maint 206 B

123456
  1. o Code simplifications and refactoring:
  2. - Remove some dead code as indicated by coverity.
  3. o Minor bugfixes:
  4. - Add some forgotten return value checks during unit tests. Found
  5. by coverity.