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