manage a bit more stuff with std::unique_ptr

Xaver Huglrequested to merge
work/zamundaaa/even-more-smart-ptrs into master

Merge request reports