Switch class variable references to instance method.