Update statics to private for SS3.1+
[MINOR] Method-comments.
Don't know why I forgot/ignored these.
Merge commit 'ad2068284bf387bc4085281a08fdb07f4a2cb74b' into 3.0