Update bindings after merge of #633, #679, #683.