More changes based on pylint messages.