Revised the stuff merged from KFSDataObject so that it will play nicely with the understood meaning of close/copy/etc.
Fixed some small errors brought up during a master branch run. With this, the KFSDataObject merge should be fixed up.