Rationalizing entity values.  All tests pass.
Rationalizing entity values.  All tests pass.