More code improvements from code review
More code improvements from code review

aschnell/libstorage-bgl-eval,openSUSE/libstorage-bgl-eval,aschnell/libstorage-bgl-eval,openSUSE/libstorage-bgl-eval,openSUSE/libstorage-bgl-eval,aschnell/libstorage-bgl-eval,aschnell/libstorage-bgl-eval,aschnell/libstorage-bgl-eval,openSUSE/libstorage-bgl-eval,openSUSE/libstorage-bgl-eval