Minor clean up before I refactor shutdown.