Minor template cleanup for Events containers.