Improve support for recursively dependent PHIs