Refactor use of `finishExpansion` in macro expansion.

As suggested in code review.

Also amends a few comments.