Some day I will remember to fix pylint things before I check in the code.
Minor minor
A bit of refactoring, inching slowly toward nicer CodeUnits
Merged