The patch looks fine (goto or no-goto). I'm curious as to why you have no SMBIOS strings though. Are you EFI-booting? Did you upgrade EFI so that it exports SMBIOS strings to kenv? I recently fixed this problem in EFI.