Cleanup `diagrams` tool code for recent changes to supported entity directives and properties