These ``datafile[]`` changes look like code cleanup and seem to be unrelated to the main commit.  Can you please break them up as I spent some time reviewing this code trying to figure out if this had anything to do with the ``USER_SITE`` change and it seems unrelated.

Use ``git add --patch`` if you need to selectively add parts of a change so that you can then commit them separately.