Be more aggressive about killing buffers.