Small tweaks to eliminate unused variables.