Big update for Darwin compatibility.