Mostly cleanup of documentation to substitute the pipe with the comma, but a few...