I slightly wonder if this is the correct test, and whether it wouldn't be better if OS_X was true.  Not enough to not merge though.