Fix quotient universe

This is on top of #371.

It's ugly and hackish, so I'm not sure we actually want this.