wip: more nan refactoring progress

Down to apparently 1 build error on v0.11.8