Put convenience fields on JSON output by `invadm data`