Slight rework of how we check for package manager state
Some back and forth, but it seems to be going the right direction