More equality method cleanup on calendars and agenda