Make addConsts match more stuff
Tweak expr optimizations