Rationalizing entity values.  Work in progress: some tests fail