PIC by default on OS X; cleanups