Unused variables.
Also one incorrect assignment that is no longer needed in R22 (but may need to be fixed in R21?).
/cc @mrimoldi @cmerlass