Gah; somehow this duplicate delete likes to keep coming back (must
have mucked up that last merge...).  Remove it.  For good.  Really.