Clean up compile time constant expression consolidation code.
Clean up compile time constant expression consolidation code.

blakeohare/crayon,blakeohare/crayon,blakeohare/crayon,blakeohare/crayon,blakeohare/crayon,blakeohare/crayon,blakeohare/crayon,blakeohare/crayon