Some cosmetic fixes.
Fixed separators again, this time looking for separators too long instead of too short.