WYCS: tweaks for catching duplication generic variable declarations.