Easy to do, will make things saner, some of these may handle shutdown/destructor situations but many do not.

At the very least, we should log(0) a message when possible.