Do not expand values that are terms unless they are vocab relative.
Reorganize and simplify value expansion.