#52: Simplify code to automatically set the label separator.