Make more code use n-ary->binary.