Fix separator handling.

Restore failing tests that were removed in 37b5f0c26abae1b1feb4dad03e6505e4416ecf72.
Correct code to properly detect nil options as indicating that a separator is being specified.