Merge "Ignore NullConstants when computing the type for Phis."