Minor edits vis-a-vis Josh.