Rebound :q to kill-buffer.  Thank goodness.