closes #4: change direct references to renamed instance variables in included methods

...and removed TraitExistingVariablesChecker