Complete re-do of the event handlin' infrastructure.