Making infrastructure types/interfaces internal again.