discover/grub2: Add nops for unnecessary builtins