Minor code and docstring changes.