Merge "Make the support code for read barriers a bit more general."