Fix various Diagram and Diagrams components APIs inconsistencies.