More work on the object nodes.