-O2 MAX_CONC warning cleanup