Fix error logging (thanks, vet)
panic on unreachable code instead of comment

vet points this out in recent versions.  If it can't happen, might as
well panic instead of just have a little comment saying we don't think
it can happen.
Simplify some code working around an unreachable case.