Cleanup `LinkedHashSet` fixes and replace them with `Set`.