FieldSelect closuring and related changes.