GitHub #80: Further cleanups in [buffer~] and [plot]