C++ standalone: should work with subgroups now