Fix waserror() calls without matching poperror()

It's highly likely something is wrong with this commit.  It's even more
likely that something is wrong with namec()'s ridiculous usage of
waserror() (stylistically, at least).

In general, every waserror() call needs to have a matching nexterror or
poperror for all possible branches from the waserror.  I think.