libdisk: Minor cleanup to new formats.