9aa3b3c3f7
There is little if any reason to treat the two components separately and it will simplify disklabel(8) and libdisk if we didn't.