Simplify grub2 misc

@aschnell what do you think?