(1) re-enabled merge point checking
(2) added an early turnaround for the alias solver