Backing out a fix I thought I was just making.  exit_type finish is ok.  It was actually setting it to 'normal' all along.