Revert from addInstanceMethod to addMethod on Class, kept addClassMethod.

Passes the unit tests.