Minor code and doc cleanup.