Fix implicit references to self.