Overhaul for a slicker pylint rating.