Minor style fixes Also, move the stripping of the binary name to the __main__ part, otherwise a nonsense argument has to be provided when running from the interactive interpreter. Patch by: Sverre Rabbelier