More minor changes to keep Pylint happy.