reintroduce kill-buffer advice. Seems like aroundadvice is the only proper way to handle killing buffers here.
improve kill-buffer advice