Fixed yet another lifetime handling bug. Sigh.