llvm-svn: 289893
This seems more consistent, and helps tidy up/simplify some other code in this change. llvm-svn: 289889