Untangle snapshot mapper

Also fixed performance issue with `StructEncoding` arbitrary
What version of thrift are you building with?