DynamicObjectInvocationHandler: More refactoring