mischief fix up build for newer vim/edk2