Renamed some internally generated and consumed display context fields
Refactor RepeatValuesMap to share code with FieldValueMap
Old-style listing passes all tests.  This is intended to be the last revision to support old style listing.