Make Commenter less dense

Refactor commenting APIs to use fewer method parameters, more objects, fewer
stubs in specs.