The grub2 hook would break manual invocations of grub2-mkconfig. This
release fixes this. A few other minor tweaks.