[sr-dev] git:master:9657cfef: tm: small cleanups for sane rutime handling