Enhance the libjson m4 macros