issue #20574: First pass on separate item site keys (for real this time).