Tweak grammar to include lifetimes, add ellipsis to indicate I almost
certainly forgot something.