Fix Max OSX cocoa build.

Bad merge didn't make everything from one of rogerman's commits go through.