Issue #2242361 by drunken monkey: Code cleanup, twelfth batch.