#367 fix detection of overridden methods
#367 renaming method addEnclosingElementsIncludingSuper