am aa874e0b: Merge "Quick: Rewrite Phi node insertion."

* commit 'aa874e0bbfb21aec0661b93cb1c2ce065bc20302':
  Quick: Rewrite Phi node insertion.