A couple more improvements for --list-only.