- Don't export internal types. Minor refactoring.