Merge "Don't accept [path|file|line].separator from the commandline."