Edits suggested by Nathan.