These should have been replaced in e53e1de5 but I missed them because ConstStrings can be implicitly converted to llvm::StringRefs.