Fix unnecessary shared_ptr; add missing checked_set()s.