Now make OS X pass with the latest Linux changes.