Merge "Accept synthetic phi nodes and general names for blocks."