More changes to make the --owner and --group items clearer.