Ready for review.  Of the two cases where cfg_parser_mapadd is called only one needed reversal on failure.