CLEANUP: Doc and cleanup refactorings.