Small cleanup.
Some renaming.
Refactoring.
Various undocumented improvements ...