Eliminate an unused variable.  Refresh two comments.