#1084, #1085. Added hooks so that someone can add additional fields when
indexing.  Also added better support for property resolution for Maps,
Collections, and single dimension arrays.