Make this catch up with some changed structs.  Fix indentation while I'm there.
Make this catch up with some changed structs.  Fix indentation while I'm there.

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