A little more code cleanup. Testing an idea for some new control events.