[#1393] pull addTrackEvent calls out of the update function stack.