Much better, but string handling has changed.

Will need to decide if we can ignore the change and alter the
unit test or work harder. I'm not sure included white space is
needed for NRTB, so may bail in the next commit.