eliminate some duplicate code related to retrieving Field references
Merge branch '2.3.x'