Defined total setoids.
Merge branch 'dev'