[PATCH] Make --help etc work for non-mock users.