More work on instancing.