dev: cibconfig: Clean up implementation of mkxmlnvpairs