Fix up setting Stuff, mostly.

Still broken somewhere, but working better than it did before.

Third time's the (unlucky) charm.