Merge "Improve use of CHECK macros."