Cleanups in MethodInvocationSupport