Rewrite merging part (although didn't make much difference). Fix a bug
on CallNode.