Fix no-asserts build failure due to unused variable, and cleanup some unique_ptr usage while I'm here

llvm-svn: 240169
1 file changed