Fixed trailing whitespaces.
Changed an oblivious use case of old LIFETIME(Id) fn to the new form.