Fixups for building with new infrastructure on OS X.