Please find attached a small cleanup patch to org-agenda.el.