fold constantexprs more aggressively, fixing PR1265