Improve quit behavior on OS X again