Introduce some changes in user event handling to prepare for DSCMonitor.