The real solution would be to redo how command line arguments are parsed. I don't consider being able to specify the server name through the command line as a huge priority, and I'd rather not use a workaround in the meanwhile.