Err, bad rebase.  Oof.  Also, don't recycle variable names.  (Copypasta, FTL.)