Some more cleanup to support multiple partmgr/bootldr