Another attempt at tidying the usage message