Optargs + fixes after running RethinkDB's polyglot tests