Wrapping up the initial comment work.