Reapply 50867: A small refactoring (extract method) + some comment fixes. Fixed the build breakage, sorry for that.
Reapply 50867: A small refactoring (extract method) + some comment fixes.
Fixed the build breakage, sorry for that.


git-svn-id: a4a6f32337ebd29ad4763b423022f00f68d1c7b7@50895 91177308-0d34-0410-b5e6-96231b3b80d8

lodyagin/bare_cxx,lodyagin/bare_cxx,lodyagin/bare_cxx,lodyagin/bare_cxx,lodyagin/bare_cxx