Remove keypath.
Add comment/message about combining fileinfo and base.