Grouping (which is to be selectable by the -g command-line option) only looks at expandable URLs, but it should include both unexpandable URLs and the expanded form of expandable URLs.

Regression test needed.