Slight rework to make pylint really happy.