Bug 454628 - [quickfix] Provide fix for unused variables