where necessary --- several of them didn't really need it, though.
tqual-checking macros simplified accordingly.