This will be an incompatible change in the JSON/YAML output of these commands, so should probably be left in.  I haven't delved into `@graph`, is it unchanged?