Improved scratch buffer-ness.