Merge "Refactor WriteBarrier logic into its own file"