Patches from Jaime Frey/(HT)Condor - pass #1 - uncontroversial changes.