fix(executor): preserve variables in nested object and list contexts