Minor changes to --encoding (et al) usage output.