Core/Phases: Removed more SetPhaseMask uses