Fix PR1101 and Analysis/ScalarEvolution/trip-count.ll