Remove sets and masses

The singularist "set" and "mass" sumti places make no sense with xorlo in place. Turn all of them into plurals.