Change type for constant expressions to Constant