Minor cleanup of field value code_list_id handling