Fixing false positives when warning unused variables (2)