Issue #24681: Move the store of so->table to the code block where it is used.