Apply the heuristic function to the correct expression in CodeMotion2.
Fix lost node error in CodeMotion2.
fixes in CodeMotion2
amendement to previous commit.
Merge pull request #18 from jankner/1.x

1.x fixes for CodeMotion2