Cleaned up unusedVars case; have to test. Fixes #1.