More OS X optimizations in set-defaults