Merge "Tidy up memory barriers."