Yup, that's entirely reasonable.

And fwiw, I gave the naive replace-all-private-with-private[this] a shot, and it is more complicated than I anticipated.  I may stick with this for a while and may end up with that separate PR -- if for no other reason than that it is turning out to be a somewhat interesting way to probe Spark's internals.