[Swan-dev] Andrew's fixes for bugs I introduced

[Andrew Cagney]

> In my defence: Kernel Style says format strings for messages should
> not be split like those were.  Thanks for fixing that too.

Yea, bleve pointed that style nit out to me

> I ran a test run to see what I had caused to break.  I missed these.
> Perhaps because I only looked at tests that had passed and then
> failed.  Another example of why it is important to get more of our
> test baseline files up to date.

both sanitize.sh and re-sanitize.sh use "diff -N -u -w -b -B ..."
which will suppresses many white space changes.

Andrew