Fix quotient universe

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