> I suppose 'set t [...]' can be let go, too?

Duh (x2).
Pushed, on top of the previous patch.

FX