Start cleaning up the internal/external types/categories a bit.