This should fix some, if not all, of the live range problems