Several edits for #377.