cleaned up HasOnePickerField constructor signature