Take account of new way of suppressing false positives relating to generic types.