Rejigger forall_vanir evaluation to avoid superflous escapement requirement

Change-Id: If68bbc3724a31c4d8fd81c0fc8e39781d5075d2c