Minor import/doc cleanup.