remove some method resolve workarounds
Merge pull request #7595 from thestinger/iterator

remove some method resolve workarounds