Cosmetic changes to the Concur class, and a rename to Diagram.