Don't use strings directly in calls to usage().  This is in preparation
for their extraction to a separate file.
31 files changed