#KJ-88 Cleanup the execution logic of method invocation. Fixed another bug from 2 commits ago.