Updates to new TypeContributor interface.