Nicer separators, fixes #6