Many more simplifications.  Pylint is now happy and a dummy run takes about 4 seconds on Leo for all 3 passes.