Tweaks to site_token syntax