`Events` package goodness, and more cleanup