Make service to restart configurable.

Also clean up USAGE output formatting.