NeXT portability changes