Avoid partial expression inception invovling recursive data structures

I tripped over this when updating a project to 0.6.