It's not a huge deal, but I would rather this sort of code to do some "intelligent guessing" go in `Distribution.Client.Init.Heuristics`.  I realize we have not been super consistent about that---there are some other `guess...` functions in this file too---but we should probably move them.