Replicated changes in #665 aimed at addressing #664. Observed no issues building Cocoa.