> b->window_count is 1.

What else should I have expected?  I attach yet another diff.  When the
same assertion triggers we'll at least know which buffer got killed.

martin