Be more pedantic about shutdown coordination