Changes to support tracking/optimization of constants.