Add some more on NaN support

Probably needs rewriting.
ADASS 23 is "in press"