Shorten vcl_persist and fix a race
Drop unused variable
Fix race in vcl_persist_active