More fixes (in other places) for travis.

Such is life when supporting multiple archs and refactoring headers on a
OSX box. =/