Issue #86 - Improved EventsController coverage.

  Also cleaned up some other code.