org-agenda: Switch to current API for two calendar calls