Cleaned up conditional ipv6 flag addition