much smarter handling of separators (#204).