Similar to a comment above, I worry that all this code is trying to repair the damage that we've done by not building the right MethodDeclarations in GCUD - which caused us to build damaged MethodBindings?