Survive `/buffer clear`

[oakkitten]

See individual commits & their messages. I hope this doesn't break things, will require a bit of hands-on testing.