Minor code cleanups. No functional change. From Alexandr Shadchin.
Minor code cleanups. No functional change. From Alexandr Shadchin.

ok nicm@

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