Patches relating to NIST io formatting failures and PR16435

[THOMAS Paul Richard 169137]

Please post the case(s) that fail here or on Bugzilla.  I will then be able
to have a peek at lunchtime.

Paul T