More work on object nodes.