Switch struct lifetime back to self

Doesn't really matter, but may as well be consistent