Handle Simplex differently in structure_for_dist
Mention token in error messages.
Fix join to avoid duplicating the body of the second argument.