Fix #518: support closure variables in object mode (with a limitation on...

... value types)