Add "set", add clarifying comments.