Push unique_ptr a bit further through some APIs and simplify some cleanup

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@222938 91177308-0d34-0410-b5e6-96231b3b80d8