Improving device address/identity matching.