Remove more false positives in unused variable detection