More minor doc-related fixes and code cleanup.