Some refactoring in the method invocation arena.