Refactor MethodDeclaration, prepare for generated adapter