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

[kud1ing]

... as suggested by the style guide.

I tried to do this myself in PR #8413 and #8314. But when the PRs got merged, several days had passed and i got lost in rebase land.