even more OS X decoupling