Separate Neustar specific changes from general purpose HLL changes