This lint fix and the one above (and others?) have already been fixed by other patches. They're probably harmless here, but you might want to rebase your patch when you sqash the two commits...