Minor refactoring of calls to covstruct init