Finish up constant-folding