Updates from code review feedback, and pylint.