Fixes to context group extraction.
Cosmetics.