Add standalone variables; allow match with no env

TODO: Make standalone variables follow commit/rollback of
environment.