Ensures slave groups are restored in block calls

The slave group seems to get forgotten in nested calls, it looks like it's because if a slave group is used the subsequent setting of a specific slave kills the group.  This remembers it within the blocks and restores, as per current shard.