forall_vanir: prevent  partial matches

Change-Id: Ifb26f8427af7d41b65b751a56a2d105609d7d0c9