more simplifications: pick the right variables to hoist fix logic to check for defaulted self value
more simplifications: pick the right variables to hoist
fix logic to check for defaulted self value

smspillaz/pychecker,smspillaz/pychecker,smspillaz/pychecker