Note: my changes to using default covariances as merged into master is more recent than this code, and we still need to review consistent handling across models.