More refactoring, bug fix MethodSpec.