There were some conflicts here, and some breakage to fix concerning library link order in newer targets.