Fix extraction of right sibling

That's what this is. The API should be cleaned up to allow for this.
Drop commented out code