Code cleanup spawned from an earlier commit today r8063. Standardize manager event...