Distance Caclulations now accept units in all cases, use this fact to
simplify things.