More scratch-buffer cleanup
5 files changed