clayborg added a comment. My only complaint is that many changes involve moving code from line N to line M. This will make merges harder. Is there any reason you actually moved all those C option array definitions? https://reviews.llvm.org/D24834