operation on our existing stack 3x faster.

The real reason for doing this, though, is robustness - the old
code was terribly fragile, depending on several tables being in order,
etc. This was breaking on some of our new switches.

Also fix a few typos in debugging messages.