MXGDA-56 minor refactor in old DataSet class to make changing issueDeprecatedWarning easier