[mr2816] Fix some visibility problems related to broken PhaseMask.