Cleanup debug crap that hasn't been used in the last decade.  Sprinkle some KNF while I'm there.  Also remove some #if 0'ed code that I'm not planning to use in the near future.
Cleanup debug crap that hasn't been used in the last decade.  Sprinkle some
KNF while I'm there.  Also remove some #if 0'ed code that I'm not planning
to use in the near future.

Apologies to deraadt@ for ignoring his diff and doing it my own way.

orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars,orumin/openbsd-efivars