The `diagrams` tool now shows non-terminals instead of predicates whenever applicable when generating entity diagrams