Merge "Improve detection of lifetime holes."