Move call to categoricals_done earlier in the covariance code