[PATCH] Usage-string fixes.