Make various adjustments to parsing so that the separator character doesn't