Fix comments.
Use function objects for unique_ptr deleters.