I pulled and built 2.02~beta3 and can confirm that the bug described above no longer exists with the newer version of open-source GRUB.
I pulled and built 2.02~beta3 and can confirm that the bug described above no longer exists with the newer version of open-source GRUB.