PR/394: Properly cleanup in new buffers function.