Update genbindings.sh somewhat for newer upstream