Little bit of refactoring. Now source type-specific interface lists, and renamed 6rd source type as just 'tunnel', so we can use it with whatever we want.