No sudo, machine-friendly output.

Added two independent commits, please review separately.