issue #22534: Make it easier to accommodate craziness.

A few tweaks here already for 22534, but this should probably be pulled in sooner rather than later because I realized on the way to re factoring an optional "fetch" methodology on collections, that the Item Site collection that was doing it the old way was broken all along. Lazy loading wasn't working.