Something terrible has happened to the commodities system

Terribe, terrible things. But we're saving so many lines of code by
rewriting other terrible parts of this wretched hulk!