Fix compile after deprecated PhaseId class is made internal
9 files changed