Cleaned up ProvidedTypesHelpers