Add some support for indefinite length data structures, etc.