Stop using 'self lifetime (now illegal).