Remove more unnecessary references to `self`