Optimize CalendarBatcher a bit

closes #516