Missed a vars/tags handling branch