Yep, these all need to be changed to `self`.