bit more msgpack refactoring