discover/grub2: Clean up error-handling for grub2 parser & lexer