Adjust the error messages to match the pattern "expected foo, found bar"

... which the coding style guide suggests.