Better addresses split (fixes NB#98684).