Add KIND_EMPTY handling.