Untangle snapshot mapper

Also fixed performance issue with `StructEncoding` arbitrary
yep, will fix