The agreed solution is instead to implement support for the AMQP 0-10 based map encoding now included in the c++ and python clients (via the new api). That is being tracked as bug 556764.