Fix some miscompilations with unused variables.