More groundwork to support field-based property mapping.

8 files changed