Improve optional-binding (strongifying self)