Changing term-level definitions to use shape library.