Update to OS X 10.11.4 looks like it went well, at least for the time being.