cleanups: Eliminate errstr
and (nearly) eliminate Unexpected
#2117
Loading
errstr
and (nearly) eliminate Unexpected
#2117