Get rid of a few warnings that show up at high warning levels.