Per review: only capture last term of an extension

And a comment or two