Restore a needed 'return' removed in the last commit, and stylistic tweak to eliminate an 'else' clause.
Restore a needed 'return' removed in the last commit, and stylistic
tweak to eliminate an 'else' clause.

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