honor --descriptor for --cli and --unit as well