Update some of the test output following introduction of accurate
source locations in error messages.  More updates to follow.