BUG-509: simple cleanup of DataTreeModification