... without unnecessary copy and re-calculation of squared distances.

Change-Id: I2900f8ef690cae750be036dcb3c4270c82286a4c