Expand context as needed to include all comments

Use methods that can be re-used to support manually expanding
context by the user.

Also fix a s/old/new/ typo bug.

Change-Id: I5b247204b959add9fbfd51af7e508d3d07b7c001