To get this fixed, we first need a change in upstream univalue. See jgarzik/univalue#13

Assuming that's accepted, next time we sync up with univalue, we'll need this change:
theuni@c2bfddd

That should take care of the problem.