default universe = universeDef

Eliminate more code duplication.