Merge "Fix a bug in optimizing when the null constant has been DCE."