fix ArrayOf and MapOf so that OffsetGet returns a value and add tests.
fix LexEntryModel after ArrayOf and MapOf changes.