libdisk: Clean up and fix Copylock variant detection.