Incremental change to ChangeBuffer
Changed iteration to range-for
Fanout no longer a template