Followup on d999ae9: add test, remove now unnecessary grouping in regexp.