Remove isTwoAddress from here too.