#KJ-88 Cleanup the execution logic of method invocation. Eliminated two grouping cells. Simplified the rules that use restoreMethodContext()