Self-avoiding random distance!  And, minor fix to self-avoiding fixed dist