Merge "Improvements to Field.get/set."