Defect states in Czochalski p-type silicon: the role of oxygen and dislocations