Fix: rewrite no-unused-vars rule (refs #1212)
Merge pull request #1219 from michaelficarra/GH-1212-no-unused-vars

Fix: rewrite no-unused-vars rule (refs #1212)