Refactor constant and instance method calls to use the same rule.

Preparing for the stubbifier.