Remove an incorrect assert() statement (ticket [beba9cae6345a]). Fix other

minor problems in the name resolution logic.

FossilOrigin-Name: afe96a118c8a9627819ba5960aa83a607e734087