vanirify flags

Change-Id: I1c02ba098adeb409575d91734e86907d9ddea0d0