Diff: rename a static factory method; add comments