Set category is univalent

This is on top of #361