instruments: even more TODO rewriting