Merge "Accept synthetic phi nodes and general names for blocks." am: 584bc17049
am: 00aad4b563

* commit '00aad4b5636d2e3f6028a476517da8a1282f12bc':
  Accept synthetic phi nodes and general names for blocks.