Fix up --calendars declaration too