Some more minor changes, one more delimiter

(See commit messages)