We no longer underscore-prefix non-public members; I can change this during merge.