Major fix in MappedCollection.
Minor code simplification.
Minor fixes.