agenda: Major cleanup.