I was thinking combining them might make it more manageable as the number grows as well. Might be more in the scope of a follow-up to the bug fix to keep the bug fix focused so I would acceptable confirm_not_library_on_destroy, then it's at least clear from the name it has a narrow use case.