TS-1820 Another round of NOWARN_UNUSED eliminations