cosmetic changes to keep the different code paths in sync; ok henning
cosmetic changes to keep the different code paths in sync; ok henning

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