Accept synthetic phi nodes and general names for blocks.

Rationale: these changes were already approved as part of the dynamic
           bce changes, but I am now sending them out separately.

Change-Id: I3564bac9f6a0b6a89466457836ff54ad09164faf