2nd pass, no changes.
2nd pass, comment/minor refactor
2nd pass, comment refactor.