Checkpoint:
  More complete interface name fixup.
  Fix calls to generic interface methods not using the generic interface method object.
Checkpoint:
  Signatures for methods of generic interfaces seem to be wrong