Here is a patch setting `completion-category-defaults'.