fixed infinite loop resolving proxy  instances, refactoring for return
from tail of methods.
reorganizing, renaming, refactoring
Merge github.com:matyb/leh