Build fix: Xcode required at least one Self - and using Self for both worked and seems clearer