ltevedallas dh said that buffy died as a joke just before that episode started.
i truly thought my sister was going to kill him and she has never forgiven him for it.
for me the buffy / spike storyline was just so well done, oh weep. and looking back on the first few series, they were so light-hearted in comparison. the swim team!