TS-1820 More UNUSED fixes, with WCCP build on