Getting rid of dependencies on the Datafile fields that are going away...