I agree, I think I may actually pull out all of the middleware from event-tracking... it's proving rather cumbersome to maintain in a separate repository.