A few changes to make new cpp-check happy.