Delete dead code in various places that is shown by gcc 4.6's new
-Wunused-but-set-variable warnings.
Signed-off-by: NRoland Dreier <rolandd@cisco.com>