Code reorganisation.
Implemented _ObjectSubQuery and _CollectionSubQuery classes.