Improve "expected" error messages