binding: more nan refactoring progress

Down to just 1 build error now...