Move buffer into apply_context
4 files changed