Edits suggested by @lamblin.