Code changed so evns.expand is only called once.