An open PR does a better job of this already, but seems to have been deemed too invasive of a change. I came across someone struggling with making things work on darwin and got them un-stuck with these little changes.

I do not know if this is the right way of presenting things, but figured I'd put it out there for others to comment.