fix really stupid typo which broke 'safe' optimizations.
Remove {Push,Pop}Vlan everywhere, but retain Link.
merge