Cleanup associated with the pull request for the XML debug information format

The prior pull request introduced some non-portable code; these two commits fix that.