Cleanup, allow getting source dataset from ZDatasetProperty