re-enable t21.  Switch order in testGibbs2 and t23.
deal with sqrt properly
1. add simplifications for
  a. nested superpose
  b. if with undefined (first) branch
2. infer types for Measures, not just values
3. widen the cases where normal density is recognized