Merge "Remove duplicate separator definition."