Revert "Revert "Consistent use of LinkedHashSet for interfaces (since interface order may matter in subtle cases)""

This reverts commit 3c09325d47515850d4b9714621c421fe71400be9.