Some refactoring and MethodInfo overloads.