Re-de-activating this code.
Undoing the hack I put in for tolweb; it's no longer needed. Also: more tests.