Minor improvements to :Bufferize