Fix regression by adding term definitions for values.