More fixes for mix of keys and non-keys in collections turned into extended collections with access control.