More refactoring! Classes get united, duplicates unduped, debuggings
proceed.