- Test arbitraries restruct.
- Some little improvements.