Patching now appends the group terminator token (albeit via ugly while True loop)