Small changes to keep pylint happy.