Improve `--list-machine' output