Simplify universe definitions a bit