Clean up the parsing of server args