Simplified & future-proofed buffer synchronization