Optimize CalendarBatcher a bit
Merge pull request #527 from twitter/fix-516

Optimize CalendarBatcher a bit