TS-1820 Eliminate some more NOWARN_UNUSED