improved Option::SEPARATOR treatment