Fix reversed logic in FlashUntil.  Also naming fix.