The `diagrams` tool now outputs non-terminal nodes when applicable when generating entity predicate cross-referencing diagrams