Merge changes from master

* Clean up comments in Parser::fLink().
* Remove unused variable.