Merge "Change FieldHelper to use a handle."