Tiny fixes of useless declarations + optim.