Support of LLVM trunk after changes in 198438, 199041, 199082 revisions.