Replace uses of self with static