[svn-r24946] - cleanup server side code to remove FUNC_ENTER/LEAVE macros as it is public.

- cleanup error reporting macros at server side for future fixes.

16 files changed, 229 insertions, 666 deletions

diff --git a/src/H5Eprivate.h b/src/H5Eprivate.h
index 1bb55aa..75b4f83 100644
--- a/src/H5Eprivate.h
+++ b/src/H5Eprivate.h
@@ -69,29 +69,11 @@ typedef struct H5E_t H5E_t;
    HGOTO_DONE(ret_val)						              \
 }
 
-#define HGOTO_ERROR_IOD(iod_ret, ret_val, string) {			      \
-   fprintf(stderr, "%s\n", string);                                           \
-   fprintf(stderr, "%d (%s).\n", iod_ret, strerror(-iod_ret));                \
-   HGOTO_DONE(ret_val)						              \
-}
-
 #define HGOTO_ERROR_FF(ret_val, string) {			              \
    fprintf(stderr, "%s\n", string);                                           \
    HGOTO_DONE(ret_val)						              \
 }
 
-#define HGOTO_ERROR2(maj, min, ret_val, string) {			      \
-   fprintf(stderr, "%s\n", string);                                           \
-   err_occurred = TRUE;                                                       \
-   err_occurred = err_occurred;         /* Shut GCC warnings up! */ \
-   HGOTO_DONE(ret_val)						              \
-}
-
-#define HDONE_ERROR2(maj, min, ret_val, string) {			      \
-   fprintf(stderr, "%s\n", string);                                           \
-   ret_value = ret_val;                                                       \
-}
-
 /*
  * HGOTO_ERROR_TAG macro, used like HGOTO_ERROR between H5_BEGIN_TAG and
  * H5_END_TAG statements.  Resets the metadata tag before leaving the function.
diff --git a/src/H5VLiod_analysis.c b/src/H5VLiod_analysis.c
index efa172d..00f200f 100644
--- a/src/H5VLiod_analysis.c
+++ b/src/H5VLiod_analysis.c
@@ -74,9 +74,6 @@ static herr_t H5VL__iod_farm_split(iod_handle_t coh, iod_obj_id_t obj_id, iod_tr
 
 static hid_t H5VL__iod_get_space_layout(coords_t coords, iod_size_t num_cells, hid_t space_id);
 
-herr_t H5VL__iod_get_query_data_cb(void *elem, hid_t type_id, unsigned ndim, 
-                                   const hsize_t *point, void *_udata);
-
 static herr_t H5VL__iod_get_query_data(iod_handle_t coh, iod_obj_id_t dset_id, 
                                        iod_trans_id_t rtid, hid_t query_id, 
                                        hid_t space_id, hid_t type_id, 
@@ -133,8 +130,6 @@ H5VL__iod_load_script(const char *script, const char *func_name)
         PyObject* dlfl_dict = PyModule_GetDict( dlfl );
     */
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* Get reference to main */
     if(NULL == (po_main = PyImport_AddModule("__main__")))
         HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, NULL, "can't get reference to main module");
@@ -155,7 +150,7 @@ H5VL__iod_load_script(const char *script, const char *func_name)
 done:
     Py_DECREF(po_rstring);
 
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL__iod_load_script() */
 
 /*-------------------------------------------------------------------------
@@ -175,8 +170,6 @@ H5VL__iod_translate_h5_type(hid_t data_type_id, enum NPY_TYPES *npy_type)
     enum NPY_TYPES translated_type;
     hid_t native_datatype_id;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if((native_datatype_id = H5Tget_native_type(data_type_id, H5T_DIR_DEFAULT)) < 0)
         HGOTO_ERROR2(H5E_ARGS, H5E_BADTYPE, FAIL, "cannot retrieve native type");
 
@@ -203,7 +196,7 @@ H5VL__iod_translate_h5_type(hid_t data_type_id, enum NPY_TYPES *npy_type)
     *npy_type = translated_type;
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL__iod_translate_h5_type() */
 
 /*-------------------------------------------------------------------------
@@ -224,8 +217,6 @@ H5VL__iod_translate_numpy_type(enum NPY_TYPES npy_type, hid_t *data_type_id,
     hid_t translated_type_id;
     size_t translated_type_size;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     switch (npy_type) {
         case NPY_LONGLONG:
             translated_type_id = H5T_NATIVE_LLONG_g;
@@ -260,7 +251,7 @@ H5VL__iod_translate_numpy_type(enum NPY_TYPES npy_type, hid_t *data_type_id,
     *data_type_size = translated_type_size;
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL__iod_translate_numpy_type() */
 
 /*-------------------------------------------------------------------------
@@ -280,8 +271,6 @@ H5VL__iod_create_numpy_array(size_t num_elmts, hid_t data_type_id, void *data)
     npy_intp dim[1] = {(npy_intp) num_elmts};
     enum NPY_TYPES npy_type;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     HDassert(data);
 
     /* Convert data_type to numpy type */
@@ -291,7 +280,7 @@ H5VL__iod_create_numpy_array(size_t num_elmts, hid_t data_type_id, void *data)
     ret_value = PyArray_SimpleNewFromData(1, dim, npy_type, data);
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL__iod_create_numpy_array() */
 
 /*-------------------------------------------------------------------------
@@ -315,8 +304,6 @@ H5VL__iod_extract_numpy_array(PyObject *numpy_array, void **data,
     int numpy_datatype;
     size_t numpy_num_elmts, extracted_datatype_size;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     HDassert(numpy_array);
     HDassert(data);
     HDassert(num_elmts);
@@ -351,7 +338,7 @@ H5VL__iod_extract_numpy_array(PyObject *numpy_array, void **data,
     *data_type_id = extracted_datatype_id;
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* H5VL__iod_extract_numpy_array */
 
 /*-------------------------------------------------------------------------
@@ -374,8 +361,6 @@ H5VL__iod_split(const char *split_script, void *data, size_t num_elmts,
     PyObject *po_func = NULL, *po_numpy_array = NULL, *po_args_tup = NULL;
     PyObject *po_numpy_array_split = NULL;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(!numpy_initialized) H5VL__iod_numpy_init();
 
     /* Create numpy array */
@@ -410,7 +395,7 @@ done:
     Py_XDECREF(po_numpy_array);
     Py_XDECREF(po_numpy_array_split);
 
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL__iod_split() */
 
 /*-------------------------------------------------------------------------
@@ -434,8 +419,6 @@ H5VL__iod_combine(const char *combine_script, void **split_data, size_t *split_n
     PyObject *po_numpy_array_combine = NULL;
     size_t i;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(!numpy_initialized) H5VL__iod_numpy_init();
 
     /* Create numpy arrays */
@@ -485,7 +468,7 @@ done:
     }
     Py_XDECREF(po_numpy_array_combine);
 
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 }
 
 #endif /* H5_HAVE_PYTHON */
@@ -508,8 +491,6 @@ H5VL__iod_request_container_open(const char *file_name, iod_handle_t **cohs)
     iod_handle_t *temp_cohs = NULL;
     int i;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (hg_reqs = (hg_request_t *)malloc(sizeof(hg_request_t) * (unsigned int) num_ions_g)))
         HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate HG requests");
 
@@ -541,7 +522,7 @@ H5VL__iod_request_container_open(const char *file_name, iod_handle_t **cohs)
     *cohs = temp_cohs;
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL__iod_request_container_open */
 
 /*-------------------------------------------------------------------------
@@ -561,8 +542,6 @@ H5VL__iod_request_container_close(iod_handle_t *cohs)
     hg_request_t *hg_reqs = NULL;
     int i;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (hg_reqs = (hg_request_t *)malloc(sizeof(hg_request_t) * (unsigned int) num_ions_g)))
         HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate HG requests");
 
@@ -589,7 +568,7 @@ H5VL__iod_request_container_close(iod_handle_t *cohs)
     free(cohs);
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL__iod_request_container_close */
 
 /*-------------------------------------------------------------------------
@@ -620,8 +599,6 @@ H5VL__iod_farm_work(iod_obj_map_t *obj_map, iod_handle_t *cohs,
     analysis_farm_in_t farm_input;
     analysis_farm_out_t *farm_output = NULL;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* function shipper requests */
     if(NULL == (hg_reqs = (hg_request_t *) malloc(sizeof(hg_request_t) * num_targets)))
         HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate HG requests");
@@ -750,7 +727,7 @@ H5VL__iod_farm_work(iod_obj_map_t *obj_map, iod_handle_t *cohs,
     free(split_num_elmts);
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL__iod_farm_work */
 
 /*-------------------------------------------------------------------------
@@ -791,8 +768,6 @@ H5VL_iod_server_analysis_execute_cb(AXE_engine_t UNUSED axe_engine,
     iod_ret_t ret;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* ****************** TEMP THING (as IOD requires collective container open) */
 
     if(FAIL == H5VL__iod_request_container_open(file_name, &cohs))
@@ -878,7 +853,7 @@ H5VL_iod_server_analysis_execute_cb(AXE_engine_t UNUSED axe_engine,
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close object");
     /* close object */
     if(iod_obj_close(obj_oh.rd_oh, NULL, NULL) < 0)
-        HDONE_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
+        HDONE_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
 
     if(iod_trans_finish(cohs[0], rtid, NULL, 0, NULL) < 0)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTSET, FAIL, "can't finish transaction 0");
@@ -908,7 +883,6 @@ done:
     input = (analysis_execute_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_analysis_execute_cb() */
 
 /*-------------------------------------------------------------------------
@@ -933,8 +907,6 @@ H5VL__iod_farm_split(iod_handle_t coh, iod_obj_id_t obj_id, iod_trans_id_t rtid,
     herr_t ret_value = SUCCEED;
     hid_t space_layout;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(FAIL == (space_layout = H5VL__iod_get_space_layout(coords, num_cells, space_id)))
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't generate local dataspace selection");
 
@@ -958,7 +930,7 @@ done:
     if(space_layout)
         H5Sclose(space_layout);
 
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL__iod_farm_work */
 
 /*-------------------------------------------------------------------------
@@ -994,8 +966,6 @@ H5VL_iod_server_analysis_farm_cb(AXE_engine_t UNUSED axe_engine,
     hid_t split_type_id;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(FAIL == H5VL__iod_farm_split(coh, obj_id, rtid, space_id, coords, num_cells,
                                     type_id, query_id, split_script,
                                     &split_data, &split_num_elmts, &split_type_id))
@@ -1019,7 +989,6 @@ H5VL_iod_server_analysis_farm_cb(AXE_engine_t UNUSED axe_engine,
 done:
     input = (analysis_farm_in_t *)H5MM_xfree(input);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_analysis_farm_cb() */
 
 /*-------------------------------------------------------------------------
@@ -1049,8 +1018,6 @@ H5VL_iod_server_analysis_transfer_cb(AXE_engine_t axe_engine,
     hg_bulk_request_t bulk_request;
     na_addr_t source = HG_Handler_get_addr(op_data->hg_handle);
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(AXE_SUCCEED != AXEget_op_data(axe_engine, input->axe_id, &farm_op_data_ptr))
         HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "failed to get farm op_data");
 
@@ -1085,7 +1052,6 @@ done:
     input = (analysis_transfer_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_analysis_farm_cb() */
 
 /*-------------------------------------------------------------------------
@@ -1109,8 +1075,6 @@ H5VL__iod_get_space_layout(coords_t coords, iod_size_t num_cells, hid_t space_id
 
     hid_t space_layout = FAIL, ret_value = FAIL;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* retrieve number of dimensions and dimensions. */
     ndims = H5Sget_simple_extent_ndims(space_id);
 
@@ -1132,10 +1096,10 @@ H5VL__iod_get_space_layout(coords_t coords, iod_size_t num_cells, hid_t space_id
 done:
     if(ret_value < 0) {
         if(FAIL != space_layout && H5Sclose(space_layout) < 0)
-            HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release dataspace")
+            HDONE_ERROR2(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release dataspace")
     } /* end if */
 
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL__iod_get_space_layout() */
 
 /*-------------------------------------------------------------------------
@@ -1155,8 +1119,6 @@ H5VL__iod_get_query_data_cb(void *elem, hid_t type_id, unsigned ndim,
     hbool_t result;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* Apply the query */
     if(H5Qapply(udata->query_id, &result, type_id, elem) < 0)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "unable to apply query to data element");
@@ -1171,7 +1133,7 @@ H5VL__iod_get_query_data_cb(void *elem, hid_t type_id, unsigned ndim,
     }
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL__iod_get_query_data_cb */
 
 /*-------------------------------------------------------------------------
@@ -1199,8 +1161,6 @@ H5VL__iod_get_query_data(iod_handle_t coh, iod_obj_id_t dset_id,
     hid_t space_query = FAIL, mem_space = FAIL;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     nelmts = (size_t) H5Sget_select_npoints(space_id);
     elmt_size = H5Tget_size(type_id);
     buf_size = nelmts * elmt_size;
@@ -1245,13 +1205,13 @@ H5VL__iod_get_query_data(iod_handle_t coh, iod_obj_id_t dset_id,
 
 done:
     if(space_query && H5Sclose(space_query) < 0)
-        HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release dataspace")
+        HDONE_ERROR2(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release dataspace")
     if(mem_space && H5Sclose(mem_space) < 0)
-        HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release dataspace")
+        HDONE_ERROR2(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release dataspace")
     if(buf != NULL)
         free(buf);
 
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL__iod_get_query_data() */
 
 /*-------------------------------------------------------------------------
@@ -1274,8 +1234,6 @@ H5VL__iod_read_selection(iod_handle_t coh, iod_obj_id_t obj_id,
     size_t elmt_size;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* open the array object */
     if (iod_obj_open_read(coh, obj_id, rtid, NULL, &obj_oh, NULL) < 0)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't open array object fo read");
@@ -1290,9 +1248,9 @@ H5VL__iod_read_selection(iod_handle_t coh, iod_obj_id_t obj_id,
 done:
     if(obj_oh.cookie != IOD_OH_UNDEFINED && 
        iod_obj_close(obj_oh, NULL, NULL) < 0)
-        HDONE_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
+        HDONE_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
 
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL__iod_read_selection() */
 
 #endif /* H5_HAVE_EFF */
diff --git a/src/H5VLiod_attr.c b/src/H5VLiod_attr.c
index 4def209..0f8ee43 100644
--- a/src/H5VLiod_attr.c
+++ b/src/H5VLiod_attr.c
@@ -70,8 +70,6 @@ H5VL_iod_server_attr_create_cb(AXE_engine_t UNUSED axe_engine,
     hbool_t opened_locally = FALSE;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start attribute create %s at %"PRIu64" with ID %"PRIx64" %"PRIx64"\n",
             attr_name, loc_handle.wr_oh.cookie, attr_id, loc_attrkv_id);
@@ -224,10 +222,10 @@ done:
 
         if(attr_oh.rd_oh.cookie != IOD_OH_UNDEFINED &&
            iod_obj_close(attr_oh.rd_oh, NULL, NULL) < 0)
-            HDONE_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't close object");
+            HDONE_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close object");
         if(attr_oh.wr_oh.cookie != IOD_OH_UNDEFINED &&
            iod_obj_close(attr_oh.wr_oh, NULL, NULL) < 0)
-            HDONE_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't close object");
+            HDONE_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close object");
 
         output.iod_oh.rd_oh.cookie = IOD_OH_UNDEFINED;
         output.iod_oh.wr_oh.cookie = IOD_OH_UNDEFINED;
@@ -243,18 +241,17 @@ done:
     /* close the Metadata KV object */
     if(mdkv_oh.cookie != IOD_OH_UNDEFINED &&
        iod_obj_close(mdkv_oh, NULL, NULL) < 0)
-        HDONE_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't close object");
+        HDONE_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close object");
 
     /* close the Attribute KV object */
     if(attr_kv_oh.cookie != IOD_OH_UNDEFINED &&
        iod_obj_close(attr_kv_oh, NULL, NULL) < 0)
-        HDONE_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't close object");
+        HDONE_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close object");
 #endif
 
     input = (attr_create_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_attr_create_cb() */
 
 
@@ -297,8 +294,6 @@ H5VL_iod_server_attr_open_cb(AXE_engine_t UNUSED axe_engine,
     H5VL_iod_link_t iod_link;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start attribute open %s at %s (OH %"PRIu64" ID %"PRIx64")\n", 
@@ -417,7 +412,6 @@ done:
     input = (attr_open_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_attr_open_cb() */
 
 
@@ -467,8 +461,6 @@ H5VL_iod_server_attr_read_cb(AXE_engine_t UNUSED axe_engine,
     iod_ret_t ret;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* open the attribute if we don't have the handle yet */
     if(iod_oh.cookie == IOD_OH_UNDEFINED) {
         if (iod_obj_open_read(coh, iod_id, rtid, NULL /*hints*/, &iod_oh, NULL) < 0)
@@ -581,9 +573,9 @@ done:
 #endif
 
     if(HG_SUCCESS != HG_Handler_start_output(op_data->hg_handle, &ret_value))
-        HDONE_ERROR(H5E_SYM, H5E_WRITEERROR, FAIL, "can't send result of write to client");
+        HDONE_ERROR2(H5E_SYM, H5E_WRITEERROR, FAIL, "can't send result of write to client");
     if(HG_SUCCESS != HG_Bulk_handle_free(bulk_block_handle))
-        HDONE_ERROR(H5E_SYM, H5E_WRITEERROR, FAIL, "can't free bds block handle");
+        HDONE_ERROR2(H5E_SYM, H5E_WRITEERROR, FAIL, "can't free bds block handle");
 
     input = (attr_io_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
@@ -604,7 +596,6 @@ done:
             HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
     }
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_attr_read_cb() */
 
 
@@ -654,8 +645,6 @@ H5VL_iod_server_attr_write_cb(AXE_engine_t UNUSED axe_engine,
     hbool_t opened_locally = FALSE; /* flag to indicate whether we opened the attribute here or if it was already opened */
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* open the attribute if we don't have the handle yet */
     if(iod_oh.cookie == IOD_OH_UNDEFINED) {
         if (iod_obj_open_write(coh, iod_id, wtid, NULL /*hints*/, &iod_oh, NULL) < 0)
@@ -760,7 +749,7 @@ done:
 #endif
 
     if(HG_SUCCESS != HG_Handler_start_output(op_data->hg_handle, &ret_value))
-        HDONE_ERROR(H5E_SYM, H5E_WRITEERROR, FAIL, "can't send result of write to client");
+        HDONE_ERROR2(H5E_SYM, H5E_WRITEERROR, FAIL, "can't send result of write to client");
 
     input = (attr_io_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
@@ -780,7 +769,6 @@ done:
         if(iod_obj_close(iod_oh, NULL, NULL) < 0)
             HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
     }
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_attr_write_cb() */
 
 
@@ -821,8 +809,6 @@ H5VL_iod_server_attr_exists_cb(AXE_engine_t UNUSED axe_engine,
     htri_t ret = -1;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start attribute Exists %s/%s on CV %d\n", loc_name, attr_name, (int)rtid);
 #endif
@@ -886,7 +872,6 @@ done:
     input = (attr_op_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_attr_exists_cb() */
 
 
@@ -932,8 +917,6 @@ H5VL_iod_server_attr_rename_cb(AXE_engine_t UNUSED axe_engine,
     iod_checksum_t sp_cs = 0;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start attribute Rename %s to %s\n", old_name, new_name);
 #endif
@@ -1017,7 +1000,6 @@ done:
     input = (attr_rename_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_attr_rename_cb() */
 
 
@@ -1064,8 +1046,6 @@ H5VL_iod_server_attr_remove_cb(AXE_engine_t UNUSED axe_engine,
     int step = 0;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start attribute Remove %s\n", attr_name);
 #endif
@@ -1191,7 +1171,6 @@ done:
     input = (attr_op_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_attr_remove_cb() */
 
 
@@ -1220,8 +1199,6 @@ H5VL_iod_server_attr_close_cb(AXE_engine_t UNUSED axe_engine,
     //iod_obj_id_t iod_id = input->iod_id; /* iod id of object to close */
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start attribute Close %"PRIu64" %"PRIu64"\n",
             iod_oh.rd_oh.cookie, iod_oh.wr_oh.cookie);
@@ -1242,7 +1219,6 @@ done:
     input = (attr_close_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_attr_close_cb() */
 
 #endif /* H5_HAVE_EFF */
diff --git a/src/H5VLiod_dset.c b/src/H5VLiod_dset.c
index 507a079..12cd76d 100644
--- a/src/H5VLiod_dset.c
+++ b/src/H5VLiod_dset.c
@@ -144,8 +144,6 @@ H5VL_iod_server_dset_create_cb(AXE_engine_t UNUSED axe_engine,
     iod_size_t array_dims[H5S_MAX_RANK], current_dims[H5S_MAX_RANK];
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     if(name)
         fprintf(stderr, "Start dataset create %s at %"PRIu64"\n", name, loc_handle.wr_oh.cookie);
@@ -368,7 +366,6 @@ done:
     input = (dset_create_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_dset_create_cb() */
 
 
@@ -408,8 +405,6 @@ H5VL_iod_server_dset_open_cb(AXE_engine_t UNUSED axe_engine,
     int step = 0;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start dataset open %s at (OH %"PRIu64" ID %"PRIx64")\n", 
             name, loc_handle.rd_oh.cookie, loc_id);
@@ -494,7 +489,6 @@ done:
     input = (dset_open_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_dset_open_cb() */
 
 
@@ -542,8 +536,6 @@ H5VL_iod_server_dset_read_cb(AXE_engine_t axe_engine,
     hbool_t opened_locally = FALSE; /* flag to indicate whether we opened the dset here or if it was already open */
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* open the dataset if we don't have the handle yet */
     if(iod_oh.rd_oh.cookie == IOD_OH_UNDEFINED) {
         if (iod_obj_open_read(coh, iod_id, rtid, NULL /*hints*/, &iod_oh.rd_oh, NULL) < 0)
@@ -666,7 +658,7 @@ done:
         fprintf(stderr, "FAILED dset read, checksum %016lX \n", cs);
 
     if(HG_SUCCESS != HG_Handler_start_output(op_data->hg_handle, &output))
-        HDONE_ERROR(H5E_SYM, H5E_WRITEERROR, FAIL, "can't send result of write to client");
+        HDONE_ERROR2(H5E_SYM, H5E_WRITEERROR, FAIL, "can't send result of write to client");
 
     input = (dset_io_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
@@ -679,9 +671,8 @@ done:
     /* close the dataset if we opened it in this routine */
     if(TRUE == opened_locally) {
         if(iod_obj_close(iod_oh.rd_oh, NULL, NULL) < 0)
-            HDONE_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
+            HDONE_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
     }
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_dset_read_cb() */
 
 
@@ -726,8 +717,6 @@ H5VL_iod_server_dset_get_vl_size_cb(AXE_engine_t UNUSED axe_engine,
     hbool_t opened_locally = FALSE; /* flag to indicate whether we opened the dset here or if it was already open */
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* open the dataset if we don't have the handle yet */
     if(iod_oh.rd_oh.cookie == IOD_OH_UNDEFINED) {
         if (iod_obj_open_write(coh, iod_id, rtid, NULL /*hints*/, &iod_oh.rd_oh, NULL) < 0)
@@ -827,7 +816,7 @@ done:
     output.buf_size = buf_size;
 
     if(HG_SUCCESS != HG_Handler_start_output(op_data->hg_handle, &output))
-        HDONE_ERROR(H5E_SYM, H5E_WRITEERROR, FAIL, "can't send result of write to client");
+        HDONE_ERROR2(H5E_SYM, H5E_WRITEERROR, FAIL, "can't send result of write to client");
 
 #if H5_EFF_DEBUG 
     fprintf(stderr, "Done with dset get vl size (%zu), sending response to client\n", buf_size);
@@ -838,9 +827,8 @@ done:
     /* close the dataset if we opened it in this routine */
     if(TRUE == opened_locally) {
         if(iod_obj_close(iod_oh.rd_oh, NULL, NULL) < 0)
-            HDONE_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
+            HDONE_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
     }
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_dset_get_vl_size_cb() */
 
 
@@ -892,8 +880,6 @@ H5VL_iod_server_dset_write_cb(AXE_engine_t UNUSED axe_engine,
     hbool_t opened_locally = FALSE; /* flag to indicate whether we opened the dset here or if it was already open */
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* open the dataset if we don't have the handle yet */
     if(iod_oh.wr_oh.cookie == IOD_OH_UNDEFINED) {
         if (iod_obj_open_write(coh, iod_id, wtid, NULL /*hints*/, &iod_oh.wr_oh, NULL) < 0)
@@ -913,7 +899,7 @@ H5VL_iod_server_dset_write_cb(AXE_engine_t UNUSED axe_engine,
 
     /* Get type info */
     if(H5VL_iod_get_type_info(src_id, &type_info) < 0)
-        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "failed to get datatype info");
+        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "failed to get datatype info");
 
     if(type_info.vls) {
         hg_bulk_segment_t *segments = NULL;
@@ -1130,7 +1116,7 @@ done:
 #endif
 
     if(HG_SUCCESS != HG_Handler_start_output(op_data->hg_handle, &ret_value))
-        HDONE_ERROR(H5E_SYM, H5E_WRITEERROR, FAIL, "can't send result of write to client");
+        HDONE_ERROR2(H5E_SYM, H5E_WRITEERROR, FAIL, "can't send result of write to client");
 
     input = (dset_io_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
@@ -1144,9 +1130,8 @@ done:
     /* close the dataset if we opened it in this routine */
     if(TRUE == opened_locally) {
         if(iod_obj_close(iod_oh.wr_oh, NULL, NULL) < 0)
-            HDONE_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
+            HDONE_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
     }
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_dset_write_cb() */
 
 
@@ -1182,8 +1167,6 @@ H5VL_iod_server_dset_set_extent_cb(AXE_engine_t UNUSED axe_engine,
     hbool_t opened_locally = FALSE;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG 
         fprintf(stderr, "Start dataset Set Extent first dim to %zu\n", 
                 (iod_size_t)input->dims.size[0]);
@@ -1249,7 +1232,6 @@ done:
             HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
     }
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_dset_set_extent_cb() */
 
 
@@ -1278,8 +1260,6 @@ H5VL_iod_server_dset_close_cb(AXE_engine_t UNUSED axe_engine,
     //iod_obj_id_t iod_id = input->iod_id; 
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start dataset Close %"PRIu64" %"PRIu64"\n",
             iod_oh.rd_oh.cookie, iod_oh.wr_oh.cookie);
@@ -1300,7 +1280,6 @@ done:
     input = (dset_close_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_dset_close_cb() */
 
 
@@ -1322,7 +1301,7 @@ done:
 herr_t 
 H5VL__iod_server_final_io(iod_handle_t iod_oh, hid_t space_id, size_t elmt_size,
                           hbool_t write_op, void *buf, 
-                          size_t UNUSED buf_size, iod_checksum_t cs, 
+                          size_t UNUSED buf_size, iod_checksum_t UNUSED cs, 
                           uint32_t cs_scope, iod_trans_id_t tid)
 {
     int ndims, i; /* dataset's rank/number of dimensions */
@@ -1335,8 +1314,6 @@ H5VL__iod_server_final_io(iod_handle_t iod_oh, hid_t space_id, size_t elmt_size,
     iod_ret_t ret;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* get the rank of the dataspace */
     if((ndims = H5Sget_simple_extent_ndims(space_id)) < 0)
         HGOTO_ERROR2(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get dataspace dimesnsion");
@@ -1498,7 +1475,7 @@ done:
         mem_desc = NULL;
     }
 
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_final_io() */
 
 
@@ -1533,8 +1510,6 @@ H5VL__iod_server_vl_data_read(iod_handle_t coh, AXE_engine_t axe_engine, AXE_tas
     size_t u, elmt_size;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* retrieve the buffer that contains the blob IDs and their sizes
        that was created in the get_size operation */
     if(AXE_SUCCEED != AXEget_op_data(axe_engine, axe_id, &get_size_op_data))
@@ -1643,7 +1618,7 @@ done:
     op_data->output = NULL;
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* H5VL__iod_server_vl_data_read */
 
 
@@ -1677,8 +1652,6 @@ H5VL__iod_server_vl_data_write(iod_handle_t coh, iod_obj_id_t iod_id, iod_handle
     void *buf = NULL;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* Print VL length DATA */
     for(u = 0; u < num_segments; u++) {
 #if H5_EFF_DEBUG
@@ -1728,7 +1701,7 @@ done:
         free(buf);
         buf = NULL;
     }
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 }/* end H5VL__iod_server_vl_data_write */
 
 
@@ -1771,8 +1744,6 @@ H5VL__iod_server_vl_data_write_cb(void UNUSED *elem, hid_t type_id, unsigned ndi
     iod_ret_t ret;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* read in the point from the array object */
     hslab.start = (iod_size_t *)malloc(sizeof(iod_size_t) * ndims);
     hslab.stride = (iod_size_t *)malloc(sizeof(iod_size_t) * ndims);
@@ -1896,7 +1867,7 @@ done:
     free(hslab.count);
     hslab.count = NULL;
 
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 }/* end H5VL__iod_server_vl_data_write_cb */
 
 #endif /* H5_HAVE_EFF */
diff --git a/src/H5VLiod_dtype.c b/src/H5VLiod_dtype.c
index c41eec6..64b834c 100644
--- a/src/H5VLiod_dtype.c
+++ b/src/H5VLiod_dtype.c
@@ -72,8 +72,6 @@ H5VL_iod_server_dtype_commit_cb(AXE_engine_t UNUSED axe_engine,
     hbool_t enable_checksum = FALSE;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start datatype commit %s at %"PRIu64"\n", name, loc_handle.wr_oh.cookie);
 #endif
@@ -290,7 +288,6 @@ done:
     last_comp = (char *)H5MM_xfree(last_comp);
     free(buf);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_dtype_commit_cb() */
 
 
@@ -337,8 +334,6 @@ H5VL_iod_server_dtype_open_cb(AXE_engine_t UNUSED axe_engine,
     int step = 0;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start datatype open %s at (OH %"PRIu64" ID %"PRIx64")\n", 
             name, loc_handle.rd_oh.cookie, loc_id);
@@ -468,7 +463,6 @@ done:
     input = (dtype_open_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_dtype_open_cb() */
 
 
@@ -497,8 +491,6 @@ H5VL_iod_server_dtype_close_cb(AXE_engine_t UNUSED axe_engine,
     //iod_obj_id_t iod_id = input->iod_id; 
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start datatype Close\n");
 #endif
@@ -522,7 +514,6 @@ done:
     input = (dtype_close_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_dtype_close_cb() */
 
 #endif /* H5_HAVE_EFF */
diff --git a/src/H5VLiod_file.c b/src/H5VLiod_file.c
index 113a21d..c4ec231 100644
--- a/src/H5VLiod_file.c
+++ b/src/H5VLiod_file.c
@@ -65,8 +65,6 @@ H5VL_iod_server_file_create_cb(AXE_engine_t UNUSED axe_engine,
     hbool_t enable_checksum = FALSE;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start file create %s ", input->name);
     fprintf(stderr, "with MDKV %"PRIx64" ", mdkv_id), 
@@ -106,23 +104,24 @@ H5VL_iod_server_file_create_cb(AXE_engine_t UNUSED axe_engine,
     /* Create the Container */
     ret = iod_container_open(input->name, con_open_hint, mode, &coh, NULL);
     if(ret < 0)
-        HGOTO_ERROR_IOD(ret, FAIL, "can't create container");
+        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't create container");
 
     /* MSC - skip transaction 0 since it can't be persisted */
     ret = iod_trans_start(coh, &first_tid, NULL, num_peers, IOD_TRANS_W, NULL);
     if(ret < 0)
-        HGOTO_ERROR_IOD(ret, FAIL, "can't start transaction 0");
+        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't start transaction 0");
+
     /* Finish  the transaction */
     ret = iod_trans_finish(coh, first_tid, NULL, 0, NULL);
     if(ret < 0)
-        HGOTO_ERROR_IOD(ret, FAIL, "can't finish transaction 0");
+        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't finish transaction 0");
 
     first_tid = 1;
 
     /* Take transaction 1 to create root group */
     ret = iod_trans_start(coh, &first_tid, NULL, num_peers, IOD_TRANS_W, NULL);
     if(ret < 0)
-        HGOTO_ERROR_IOD(ret, FAIL, "can't start transaction");
+        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't start transaction 1");
 
     /* create the root group */
     root_ret = iod_obj_create(coh, first_tid, obj_create_hint, IOD_OBJ_KV, 
@@ -131,13 +130,13 @@ H5VL_iod_server_file_create_cb(AXE_engine_t UNUSED axe_engine,
         /* root group has been created, open it */
         ret = iod_obj_open_write(coh, root_id, first_tid, NULL, &root_oh.wr_oh, NULL);
         if(ret < 0)
-            HGOTO_ERROR_IOD(ret, FAIL, "can't open root group for write");
+            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't open root group for write");
         ret = iod_obj_open_read(coh, root_id, first_tid, NULL, &root_oh.rd_oh, NULL);
         if(ret < 0)
-            HGOTO_ERROR_IOD(ret, FAIL, "can't open root group for read");
+            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't open root group for read");
     }
     else {
-        HGOTO_ERROR_IOD(ret, FAIL, "can't create root group");
+        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't create root group");
     }
 
     /* for the process that succeeded in creating the group, create
@@ -151,19 +150,19 @@ H5VL_iod_server_file_create_cb(AXE_engine_t UNUSED axe_engine,
         ret = iod_obj_create(coh, first_tid, obj_create_hint, IOD_OBJ_KV, 
                              NULL, NULL, &mdkv_id, NULL);
         if(ret < 0)
-            HGOTO_ERROR_IOD(ret, FAIL, "can't create metadata KV object");
+            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't create metadata KV object");
 
         /* create the attribute KV object for the root group */
         ret = iod_obj_create(coh, first_tid, obj_create_hint, IOD_OBJ_KV, 
                              NULL, NULL, &attrkv_id, NULL);
         if(ret < 0)
-            HGOTO_ERROR_IOD(ret, FAIL, "can't create attribute KV object");
+            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't create attribute KV object");
 
         /* create the KV object to hold each client's indexes for
            object OIDs after each trans_finish and file_close */
         ret = iod_obj_create(coh, first_tid, NULL, IOD_OBJ_KV, NULL, NULL, &oidkv_id, NULL);
         if(ret != 0)
-            HGOTO_ERROR_IOD(ret, FAIL, "can't create array for OID indexes");
+            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't create array for OID indexes");
 
         /* set values for the scratch pad object */
         sp[0] = mdkv_id;
@@ -179,18 +178,18 @@ H5VL_iod_server_file_create_cb(AXE_engine_t UNUSED axe_engine,
             /* set scratch pad in root group */
             ret = iod_obj_set_scratch(root_oh.wr_oh, first_tid, &sp, &sp_cs, NULL);
             if(ret < 0)
-                HGOTO_ERROR_IOD(ret, FAIL, "can't set scratch pad");
+                HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't set scratch pad");
         }
         else {
             ret = iod_obj_set_scratch(root_oh.wr_oh, first_tid, &sp, NULL, NULL);
             if(ret < 0)
-                HGOTO_ERROR_IOD(ret, FAIL, "can't set scratch pad");
+                HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't set scratch pad");
         }
 
         /* Store Metadata in scratch pad */
         ret = iod_obj_open_write(coh, input->mdkv_id, first_tid, NULL, &mdkv_oh, NULL);
         if(ret < 0)
-            HGOTO_ERROR_IOD(ret, FAIL, "can't open metadata KV");
+            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't open metadata KV");
 
         /* insert plist metadata */
         if(H5VL_iod_insert_plist(mdkv_oh, first_tid, fcpl_id, cs_scope, NULL, NULL) < 0)
@@ -208,12 +207,12 @@ H5VL_iod_server_file_create_cb(AXE_engine_t UNUSED axe_engine,
             cs[1] = H5_checksum_crc64(kv.value, kv.value_len);
             ret = iod_kv_set(mdkv_oh, first_tid, NULL, &kv, cs, NULL);
             if(ret < 0)
-                HGOTO_ERROR_IOD(ret, FAIL, "can't set KV pair in parent");
+                HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't set KV pair in parent");
         }
         else {
             ret = iod_kv_set(mdkv_oh, first_tid, NULL, &kv, NULL, NULL);
             if(ret < 0)
-                HGOTO_ERROR_IOD(ret, FAIL, "can't set KV pair in parent");
+                HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't set KV pair in parent");
         }
 
         kv.key = (void *)H5VL_IOD_KEY_ARRAY_IDS_INDEX;
@@ -225,12 +224,12 @@ H5VL_iod_server_file_create_cb(AXE_engine_t UNUSED axe_engine,
             cs[1] = H5_checksum_crc64(kv.value, kv.value_len);
             ret = iod_kv_set(mdkv_oh, first_tid, NULL, &kv, cs, NULL);
             if(ret < 0)
-                HGOTO_ERROR_IOD(ret, FAIL, "can't set KV pair in parent");
+                HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't set KV pair in parent");
         }
         else {
             ret = iod_kv_set(mdkv_oh, first_tid, NULL, &kv, NULL, NULL);
             if(ret < 0)
-                HGOTO_ERROR_IOD(ret, FAIL, "can't set KV pair in parent");
+                HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't set KV pair in parent");
         }
 
         kv.key = (void *)H5VL_IOD_KEY_BLOB_IDS_INDEX;
@@ -242,23 +241,23 @@ H5VL_iod_server_file_create_cb(AXE_engine_t UNUSED axe_engine,
             cs[1] = H5_checksum_crc64(kv.value, kv.value_len);
             ret = iod_kv_set(mdkv_oh, first_tid, NULL, &kv, cs, NULL);
             if(ret < 0)
-                HGOTO_ERROR_IOD(ret, FAIL, "can't set KV pair in parent");
+                HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't set KV pair in parent");
         }
         else {
             ret = iod_kv_set(mdkv_oh, first_tid, NULL, &kv, NULL, NULL);
             if(ret < 0)
-                HGOTO_ERROR_IOD(ret, FAIL, "can't set KV pair in parent");
+                HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't set KV pair in parent");
         }
 
         ret = iod_obj_close(mdkv_oh, NULL, NULL);
         if(ret < 0)
-            HGOTO_ERROR_IOD(ret, FAIL, "can't close root object handle");
+            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close root object handle");
     }
 
     /* Finish  the transaction */
     ret = iod_trans_finish(coh, first_tid, NULL, 0, NULL);
     if(ret < 0)
-        HGOTO_ERROR_IOD(ret, FAIL, "can't finish transaction 1");
+        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't finish transaction 1");
 
     output.coh.cookie = coh.cookie;
     output.root_oh.rd_oh = root_oh.rd_oh;
@@ -287,7 +286,6 @@ done:
         con_open_hint = NULL;
     }
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_file_create_cb() */
 
 
@@ -331,8 +329,6 @@ H5VL_iod_server_file_open_cb(AXE_engine_t UNUSED axe_engine,
     iod_hint_list_t *con_open_hint = NULL;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start file open %s %d %d\n", input->name, input->flags, input->fapl_id);
 #endif
@@ -411,7 +407,7 @@ H5VL_iod_server_file_open_cb(AXE_engine_t UNUSED axe_engine,
 
     ret = iod_kv_get_num(oidkv_oh, rtid, &num_entries, NULL);
     if(ret != 0)
-        HGOTO_ERROR_IOD(ret, FAIL, "can't get number of KV entries");
+        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't get number of KV entries");
 
     val_size = sizeof(uint64_t);
 
@@ -441,7 +437,7 @@ H5VL_iod_server_file_open_cb(AXE_engine_t UNUSED axe_engine,
 
         ret = iod_kv_get_list(oidkv_oh, rtid, NULL, 0, &num_entries, kvs, NULL);
         if(ret != 0)
-            HGOTO_ERROR_IOD(ret, FAIL, "can't get KV list from OID KV");
+            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't get KV list from OID KV");
 
         for(i=0 ; i<num_entries ; i++) {
             uint64_t *oid_index = (uint64_t *)kv[i].value;
@@ -561,7 +557,6 @@ done:
         con_open_hint = NULL;
     }
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_file_open_cb() */
 
 
@@ -591,8 +586,6 @@ H5VL_iod_server_file_close_cb(AXE_engine_t UNUSED axe_engine,
     iod_ret_t ret;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start file close\n");
 #endif
@@ -725,7 +718,7 @@ H5VL_iod_server_file_close_cb(AXE_engine_t UNUSED axe_engine,
 
             ret = iod_kv_get_num(oidkv_oh.rd_oh, rtid, &num_entries, NULL);
             if(ret != 0)
-                HGOTO_ERROR_IOD(ret, FAIL, "can't get number of KV entries");
+                HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't get number of KV entries");
 
 #if H5_EFF_DEBUG
             fprintf(stderr, "NUM entries in OID index KV = %d\n", num_entries);
@@ -747,11 +740,11 @@ H5VL_iod_server_file_close_cb(AXE_engine_t UNUSED axe_engine,
 
                 ret = iod_kv_list_key(oidkv_oh.rd_oh, rtid, NULL, 0, &num_entries, kvs, NULL);
                 if(ret != 0)
-                    HGOTO_ERROR_IOD(ret, FAIL, "can't get list of keys");
+                    HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't get list of keys");
 
                 ret = iod_kv_unlink_keys(oidkv_oh.wr_oh, trans_num, NULL, num_entries, kvs, NULL);
                 if(ret != 0)
-                    HGOTO_ERROR_IOD(ret, FAIL, "can't unlink keys in OID index KV");
+                    HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't unlink keys in OID index KV");
 
                 for(i=0 ; i<num_entries ; i++)
                     free(oid_kv[i].key);
@@ -818,7 +811,6 @@ done:
     input = (file_close_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_file_close_cb() */
 
 #endif /* H5_HAVE_EFF */
diff --git a/src/H5VLiod_group.c b/src/H5VLiod_group.c
index b97e933..26ca074 100644
--- a/src/H5VLiod_group.c
+++ b/src/H5VLiod_group.c
@@ -69,8 +69,6 @@ H5VL_iod_server_group_create_cb(AXE_engine_t UNUSED axe_engine,
     int step = 0;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start group create %s at %"PRIu64"\n", name, loc_handle.wr_oh.cookie);
 #endif
@@ -234,7 +232,6 @@ done:
     input = (group_create_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_group_create_cb() */
 
 
@@ -274,8 +271,6 @@ H5VL_iod_server_group_open_cb(AXE_engine_t UNUSED axe_engine,
     int step = 0;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start group open %s at (OH %"PRIu64" ID %"PRIx64")\n", 
             name, loc_handle.rd_oh.cookie, loc_id);
@@ -358,7 +353,6 @@ done:
     input = (group_open_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_group_open_cb() */
 
 
@@ -386,8 +380,6 @@ H5VL_iod_server_group_close_cb(AXE_engine_t UNUSED axe_engine,
     iod_handles_t iod_oh = input->iod_oh;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start group close\n");
 #endif
@@ -412,7 +404,6 @@ done:
     input = (group_close_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_group_close_cb() */
 
 #endif /* H5_HAVE_EFF */
diff --git a/src/H5VLiod_index.c b/src/H5VLiod_index.c
index b55aaa3..ffacd57 100644
--- a/src/H5VLiod_index.c
+++ b/src/H5VLiod_index.c
@@ -55,8 +55,6 @@ H5VL_iod_server_dset_set_index_info_cb(AXE_engine_t UNUSED axe_engine,
     iod_kv_t kv;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG 
     fprintf(stderr, "Start dataset set_index_info\n");
 #endif
@@ -107,7 +105,7 @@ H5VL_iod_server_dset_set_index_info_cb(AXE_engine_t UNUSED axe_engine,
 
 done:
     if(HG_SUCCESS != HG_Handler_start_output(op_data->hg_handle, &ret_value))
-        HDONE_ERROR(H5E_SYM, H5E_WRITEERROR, FAIL, "can't send result of write to client");
+        HDONE_ERROR2(H5E_SYM, H5E_WRITEERROR, FAIL, "can't send result of write to client");
 
     /* close the Metadata KV object */
     if(iod_obj_close(mdkv_oh, NULL, NULL) < 0)
@@ -116,7 +114,6 @@ done:
     input = (dset_set_index_info_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_dset_set_index_info_cb() */
 
 
@@ -154,8 +151,6 @@ H5VL_iod_server_dset_get_index_info_cb(AXE_engine_t UNUSED axe_engine,
     iod_ret_t ret;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG 
     fprintf(stderr, "Start dataset get_index_info\n");
 #endif
@@ -257,7 +252,6 @@ done:
     input = (dset_get_index_info_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_dset_get_index_info_cb() */
 
 
@@ -292,8 +286,6 @@ H5VL_iod_server_dset_remove_index_info_cb(AXE_engine_t UNUSED axe_engine,
     iod_ret_t ret;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG 
     fprintf(stderr, "Start dataset rm_index_info\n");
 #endif
@@ -324,7 +316,7 @@ H5VL_iod_server_dset_remove_index_info_cb(AXE_engine_t UNUSED axe_engine,
 
 done:
     if(HG_SUCCESS != HG_Handler_start_output(op_data->hg_handle, &ret_value))
-        HDONE_ERROR(H5E_SYM, H5E_WRITEERROR, FAIL, "can't send result of write to client");
+        HDONE_ERROR2(H5E_SYM, H5E_WRITEERROR, FAIL, "can't send result of write to client");
 
     /* close the Metadata KV object */
     if(iod_obj_close(mdkv_oh, NULL, NULL) < 0)
@@ -333,7 +325,6 @@ done:
     input = (dset_rm_index_info_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_dset_remove_index_info_cb() */
 
 #endif /* H5_HAVE_INDEXING */
diff --git a/src/H5VLiod_link.c b/src/H5VLiod_link.c
index 7f9f8df..7e22e8e 100644
--- a/src/H5VLiod_link.c
+++ b/src/H5VLiod_link.c
@@ -58,8 +58,6 @@ H5VL_iod_server_link_create_cb(AXE_engine_t UNUSED axe_engine,
     char *src_last_comp = NULL, *dst_last_comp = NULL;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start Link create\n");
 #endif
@@ -186,7 +184,6 @@ done:
     input = (link_create_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_link_create_cb() */
 
 
@@ -225,8 +222,6 @@ H5VL_iod_server_link_move_cb(AXE_engine_t UNUSED axe_engine,
     H5VL_iod_link_t iod_link;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start link move SRC %s DST %s (%"PRIu64", %"PRIu64") to (%"PRIu64", %"PRIu64")\n",
             input->src_loc_name, input->dst_loc_name, 
@@ -372,7 +367,6 @@ done:
             free(iod_link.u.symbolic_name);
     }
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_link_move_cb() */
 
 
@@ -410,8 +404,6 @@ H5VL_iod_server_link_exists_cb(AXE_engine_t UNUSED axe_engine,
     iod_size_t val_size = 0;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start link Exists for %s on CV %d\n", loc_name, (int)rtid);
 #endif
@@ -471,7 +463,6 @@ done:
     op_data = (op_data_t *)H5MM_xfree(op_data);
     last_comp = (char *)H5MM_xfree(last_comp);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_link_exists_cb() */
 
 
@@ -509,8 +500,6 @@ H5VL_iod_server_link_get_info_cb(AXE_engine_t UNUSED axe_engine,
     H5VL_iod_link_t iod_link;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* the traversal will retrieve the location where the link needs
        to be checked */
     if(H5VL_iod_server_traverse(coh, loc_id, loc_oh, loc_name, rtid, rtid, FALSE, 
@@ -575,7 +564,6 @@ done:
             free(iod_link.u.symbolic_name);
     }
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_link_get_info_cb() */
 
 
@@ -614,8 +602,6 @@ H5VL_iod_server_link_get_val_cb(AXE_engine_t UNUSED axe_engine,
     H5VL_iod_link_t iod_link;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* the traversal will retrieve the location where the link needs
        to be checked */
     if(H5VL_iod_server_traverse(coh, loc_id, loc_oh, loc_name, rtid, rtid, FALSE, 
@@ -680,7 +666,6 @@ done:
             free(iod_link.u.symbolic_name);
     }
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_link_get_val_cb() */
 
 
@@ -725,8 +710,6 @@ H5VL_iod_server_link_remove_cb(AXE_engine_t UNUSED axe_engine,
     int step = 0;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start link Remove %s at (%"PRIu64", %"PRIu64")\n",
             loc_name, loc_oh.wr_oh.cookie, loc_oh.rd_oh.cookie);
@@ -860,7 +843,6 @@ done:
             free(iod_link.u.symbolic_name);
     }
         
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_link_remove_cb() */
 
 #endif /* H5_HAVE_EFF */
diff --git a/src/H5VLiod_map.c b/src/H5VLiod_map.c
index f247bdc..8be68e4 100644
--- a/src/H5VLiod_map.c
+++ b/src/H5VLiod_map.c
@@ -73,8 +73,6 @@ H5VL_iod_server_map_create_cb(AXE_engine_t UNUSED axe_engine,
     scratch_pad sp;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
         fprintf(stderr, "Start map create %s at %"PRIu64"\n", 
                 name, loc_handle.wr_oh.cookie);
@@ -240,7 +238,6 @@ done:
     input = (map_create_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_map_create_cb() */
 
 
@@ -280,8 +277,6 @@ H5VL_iod_server_map_open_cb(AXE_engine_t UNUSED axe_engine,
     int step = 0;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start map open %s at (OH %"PRIu64" ID %"PRIx64")\n", 
             name, loc_handle.rd_oh.cookie, loc_id);
@@ -370,7 +365,6 @@ done:
     input = (map_open_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_map_open_cb() */
 
 
@@ -420,8 +414,6 @@ H5VL_iod_server_map_set_cb(AXE_engine_t UNUSED axe_engine,
     hbool_t val_is_vl_data = FALSE, key_is_vl_data = FALSE;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG 
     fprintf(stderr, "Start Map Set Key %d on OH %"PRIu64" OID %"PRIx64"\n", 
             *((int *)key.buf), iod_oh.cookie, iod_id);
@@ -549,7 +541,7 @@ H5VL_iod_server_map_set_cb(AXE_engine_t UNUSED axe_engine,
 done:
 
     if(HG_SUCCESS != HG_Handler_start_output(op_data->hg_handle, &ret_value))
-        HDONE_ERROR(H5E_SYM, H5E_WRITEERROR, FAIL, "can't send result of write to client");
+        HDONE_ERROR2(H5E_SYM, H5E_WRITEERROR, FAIL, "can't send result of write to client");
 
     input = (map_set_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
@@ -567,7 +559,6 @@ done:
     fprintf(stderr, "Done with map set, sent %d response to client\n", ret_value);
 #endif
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_map_set_cb() */
 
 
@@ -619,8 +610,6 @@ H5VL_iod_server_map_get_cb(AXE_engine_t UNUSED axe_engine,
     iod_checksum_t kv_cs[2];
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG 
     fprintf(stderr, "Start Map Get Key %d on OH %"PRIu64" OID %"PRIx64"\n", 
             *((int *)key.buf), iod_oh.cookie, iod_id);
@@ -783,7 +772,7 @@ done:
         output.val_size = 0;
         output.val_cs = 0;
         if(HG_SUCCESS != HG_Handler_start_output(op_data->hg_handle, &output))
-            HDONE_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't send result of map get");
+            HDONE_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "can't send result of map get");
     }
 
     if(val_buf) 
@@ -798,7 +787,6 @@ done:
             HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
     }
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_map_get_cb() */
 
 
@@ -833,8 +821,6 @@ H5VL_iod_server_map_get_count_cb(AXE_engine_t UNUSED axe_engine,
     hbool_t opened_locally = FALSE;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start map get_count \n");
 #endif
@@ -863,7 +849,7 @@ done:
     if(ret_value < 0) {
         output = IOD_COUNT_UNDEFINED;
         if(HG_SUCCESS != HG_Handler_start_output(op_data->hg_handle, &output))
-            HDONE_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't send result of map get_count");
+            HDONE_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "can't send result of map get_count");
     }
 
     input = (map_get_count_in_t *)H5MM_xfree(input);
@@ -875,7 +861,6 @@ done:
             HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
     }
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_map_get_count_cb() */
 
 
@@ -915,8 +900,6 @@ H5VL_iod_server_map_exists_cb(AXE_engine_t UNUSED axe_engine,
     hbool_t is_vl_data = FALSE;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start map exists \n");
 #endif
@@ -953,7 +936,7 @@ done:
     if(ret_value < 0) {
         exists = -1; 
         if(HG_SUCCESS != HG_Handler_start_output(op_data->hg_handle, &exists))
-            HDONE_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't send result of map exists");
+            HDONE_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "can't send result of map exists");
     }
 
     input = (map_op_in_t *)H5MM_xfree(input);
@@ -965,7 +948,6 @@ done:
             HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
     }
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_map_exists_cb() */
 
 
@@ -1005,8 +987,6 @@ H5VL_iod_server_map_delete_cb(AXE_engine_t UNUSED axe_engine,
     hbool_t is_vl_data = FALSE;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start map delete \n");
 #endif
@@ -1041,7 +1021,7 @@ done:
 #endif
 
     if(HG_SUCCESS != HG_Handler_start_output(op_data->hg_handle, &ret_value))
-        HDONE_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't send result of map delete");
+        HDONE_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "can't send result of map delete");
 
     input = (map_op_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
@@ -1052,7 +1032,6 @@ done:
             HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
     }
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_map_delete_cb() */
 
 
@@ -1080,8 +1059,6 @@ H5VL_iod_server_map_close_cb(AXE_engine_t UNUSED axe_engine,
     iod_handles_t iod_oh = input->iod_oh;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start map Close %"PRIu64" %"PRIu64"\n",
             iod_oh.rd_oh.cookie, iod_oh.wr_oh.cookie);
@@ -1102,7 +1079,6 @@ done:
     input = (map_close_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_map_close_cb() */
 
 #endif /* H5_HAVE_EFF */
diff --git a/src/H5VLiod_obj.c b/src/H5VLiod_obj.c
index 10c464f..b073071 100644
--- a/src/H5VLiod_obj.c
+++ b/src/H5VLiod_obj.c
@@ -53,8 +53,6 @@ H5VL_iod_server_object_open_by_token_cb(AXE_engine_t UNUSED axe_engine,
     iod_handles_t obj_oh; /* The handle for object */
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start Object Open by token = %"PRIx64"\n", obj_id);
 #endif
@@ -80,7 +78,6 @@ done:
     input = (object_token_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_object_open_cb() */
 
 
@@ -116,8 +113,6 @@ H5VL_iod_server_object_open_cb(AXE_engine_t UNUSED axe_engine,
     iod_checksum_t sp_cs = 0;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start Object Open on %s (OH %"PRIu64" ID %"PRIx64")\n", 
             input->loc_name, input->loc_oh.rd_oh.cookie, input->loc_id);
@@ -295,7 +290,6 @@ done:
     input = (object_op_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_object_open_cb() */
 
 
@@ -338,8 +332,6 @@ H5VL_iod_server_object_copy_cb(AXE_engine_t UNUSED axe_engine,
     iod_checksum_t sp_cs = 0;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start object copy\n");
 #endif
@@ -494,7 +486,6 @@ done:
     input = (object_copy_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_object_copy_cb() */
 
 
@@ -530,8 +521,6 @@ H5VL_iod_server_object_exists_cb(AXE_engine_t UNUSED axe_engine,
     htri_t ret = -1;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start Object Exists on %s (OH %"PRIu64" ID %"PRIx64")\n", 
             input->loc_name, input->loc_oh.rd_oh.cookie, input->loc_id);
@@ -564,7 +553,6 @@ done:
     input = (object_op_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_object_exists_cb() */
 
 
@@ -606,8 +594,6 @@ H5VL_iod_server_object_get_info_cb(AXE_engine_t UNUSED axe_engine,
     uint64_t link_count = 0;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start Object Get Info on %s (OH %"PRIu64" ID %"PRIx64")\n", 
             input->loc_name, input->loc_oh.rd_oh.cookie, input->loc_id);
@@ -711,7 +697,6 @@ done:
     input = (object_op_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_object_get_info_cb() */
 
 
@@ -751,8 +736,6 @@ H5VL_iod_server_object_set_comment_cb(AXE_engine_t UNUSED axe_engine,
     iod_checksum_t sp_cs = 0;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start Object Set comment on %s (OH %"PRIu64" ID %"PRIx64")\n", 
             input->path, input->loc_oh.rd_oh.cookie, input->loc_id);
@@ -826,7 +809,6 @@ done:
     input = (object_set_comment_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_object_set_comment_cb() */
 
 
@@ -870,8 +852,6 @@ H5VL_iod_server_object_get_comment_cb(AXE_engine_t UNUSED axe_engine,
     iod_checksum_t *iod_cs = NULL;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start Object Get comment on %s (OH %"PRIu64" ID %"PRIx64")\n", 
             input->path, input->loc_oh.rd_oh.cookie, input->loc_id);
@@ -976,7 +956,6 @@ done:
     input = (object_get_comment_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_object_get_comment_cb() */
 
 #if 0
@@ -1013,8 +992,6 @@ H5VL_iod_server_object_open_by_addr_cb(AXE_engine_t UNUSED axe_engine,
     iod_checksum_t sp_cs = 0;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Start Object Open By addr on %"PRIx64"\n", obj_id);
 #endif
@@ -1190,7 +1167,6 @@ done:
     input = (object_op_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_object_open_by_addr_cb() */
 #endif
 
diff --git a/src/H5VLiod_server.c b/src/H5VLiod_server.c
index e9230de..7215223 100644
--- a/src/H5VLiod_server.c
+++ b/src/H5VLiod_server.c
@@ -387,15 +387,13 @@ H5VL__iod_server_finish_axe_tasks(AXE_engine_t axe_engine, AXE_task_t start_rang
     AXE_task_t u;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     for(u=start_range ; u<count+start_range ; u++) {
         if(AXE_SUCCEED != AXEfinish(axe_engine, u))
-            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "Unable to cleanup AXE task");
+            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "Unable to cleanup AXE task")
     }
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL__iod_server_finish_axe_tasks() */
 
 
@@ -419,8 +417,6 @@ H5VL_iod_server_eff_init(hg_handle_t handle)
     uint32_t num_procs;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* get the input from the client connecting */
     if(HG_FAIL == HG_Handler_get_input(handle, &num_procs))
 	HGOTO_ERROR2(H5E_FILE, H5E_CANTGET, HG_FAIL, "can't get input parameters");
@@ -437,7 +433,7 @@ H5VL_iod_server_eff_init(hg_handle_t handle)
 
 done:
     HG_Handler_start_output(handle, &ret_value);
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_eff_init() */
 
 
@@ -459,8 +455,6 @@ H5VL_iod_server_eff_finalize(hg_handle_t handle)
 {
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* increment the number of terminate requests received so far */
     terminate_requests ++;
 
@@ -476,7 +470,7 @@ H5VL_iod_server_eff_finalize(hg_handle_t handle)
 
 done:
     HG_Handler_start_output(handle, &ret_value);
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_eff_finalize() */
 
 
@@ -501,8 +495,6 @@ H5VL_iod_server_analysis_execute(hg_handle_t handle)
     analysis_execute_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -531,7 +523,7 @@ H5VL_iod_server_analysis_execute(hg_handle_t handle)
         HGOTO_ERROR2(H5E_FILE, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_analysis_execute() */
 
 
@@ -557,8 +549,6 @@ H5VL_iod_server_analysis_farm(hg_handle_t handle)
     AXE_task_t axe_id;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -583,7 +573,7 @@ H5VL_iod_server_analysis_farm(hg_handle_t handle)
         HGOTO_ERROR2(H5E_FILE, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_analysis_farm() */
 
 
@@ -609,8 +599,6 @@ H5VL_iod_server_analysis_transfer(hg_handle_t handle)
     AXE_task_t axe_id;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -634,7 +622,7 @@ H5VL_iod_server_analysis_transfer(hg_handle_t handle)
         HGOTO_ERROR2(H5E_FILE, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_analysis_transfer() */
 
 int
@@ -644,8 +632,6 @@ H5VL_iod_server_container_open(hg_handle_t handle)
     iod_handle_t coh;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(HG_FAIL == HG_Handler_get_input(handle, &file_name))
 	HGOTO_ERROR2(H5E_FILE, H5E_CANTGET, HG_FAIL, "can't get input parameters");
 
@@ -661,8 +647,7 @@ done:
         coh.cookie = IOD_OH_UNDEFINED;
         HG_Handler_start_output(handle, &coh);
     }
-
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_container_open() */
 
 int
@@ -671,8 +656,6 @@ H5VL_iod_server_container_close(hg_handle_t handle)
     iod_handle_t coh;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(HG_FAIL == HG_Handler_get_input(handle, &coh))
 	HGOTO_ERROR2(H5E_FILE, H5E_CANTGET, HG_FAIL, "can't get input parameters");
 
@@ -682,8 +665,7 @@ H5VL_iod_server_container_close(hg_handle_t handle)
 
 done:
     HG_Handler_start_output(handle, &ret_value);
-
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_container_open() */
 
 
@@ -709,8 +691,6 @@ H5VL_iod_server_cancel_op(hg_handle_t handle)
     H5ES_status_t status = H5ES_STATUS_IN_PROGRESS;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(HG_FAIL == HG_Handler_get_input(handle, &axe_id))
 	HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, HG_FAIL, "can't get input parameters");
 
@@ -730,9 +710,10 @@ H5VL_iod_server_cancel_op(hg_handle_t handle)
             HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, HG_FAIL, "can't get op data");
         /* Attempt to cancel the task manually */
     }
+
 done:
     HG_Handler_start_output(handle, &status);
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_cancel_op() */
 
 
@@ -757,8 +738,6 @@ H5VL_iod_server_file_create(hg_handle_t handle)
     file_create_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -784,7 +763,7 @@ H5VL_iod_server_file_create(hg_handle_t handle)
         HGOTO_ERROR2(H5E_FILE, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_file_create() */
 
 
@@ -809,8 +788,6 @@ H5VL_iod_server_file_open(hg_handle_t handle)
     file_open_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -836,7 +813,7 @@ H5VL_iod_server_file_open(hg_handle_t handle)
         HGOTO_ERROR2(H5E_FILE, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_file_open() */
 
 
@@ -861,8 +838,6 @@ H5VL_iod_server_file_close(hg_handle_t handle)
     file_close_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -889,7 +864,7 @@ H5VL_iod_server_file_close(hg_handle_t handle)
         HGOTO_ERROR2(H5E_FILE, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_file_close() */
 
 
@@ -914,8 +889,6 @@ H5VL_iod_server_attr_create(hg_handle_t handle)
     attr_create_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -943,7 +916,7 @@ H5VL_iod_server_attr_create(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_attr_create() */
 
 
@@ -968,8 +941,6 @@ H5VL_iod_server_attr_open(hg_handle_t handle)
     attr_open_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -997,7 +968,7 @@ H5VL_iod_server_attr_open(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_attr_open() */
 
 
@@ -1022,8 +993,6 @@ H5VL_iod_server_attr_read(hg_handle_t handle)
     attr_io_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -1051,7 +1020,7 @@ H5VL_iod_server_attr_read(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_attr_read() */
 
 
@@ -1076,8 +1045,6 @@ H5VL_iod_server_attr_write(hg_handle_t handle)
     attr_io_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -1105,7 +1072,7 @@ H5VL_iod_server_attr_write(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_attr_write() */
 
 
@@ -1130,8 +1097,6 @@ H5VL_iod_server_attr_exists(hg_handle_t handle)
     attr_op_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -1159,7 +1124,7 @@ H5VL_iod_server_attr_exists(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_attr_exists() */
 
 
@@ -1184,8 +1149,6 @@ H5VL_iod_server_attr_rename(hg_handle_t handle)
     attr_rename_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -1213,7 +1176,7 @@ H5VL_iod_server_attr_rename(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_attr_rename() */
 
 
@@ -1238,8 +1201,6 @@ H5VL_iod_server_attr_remove(hg_handle_t handle)
     attr_op_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -1267,7 +1228,7 @@ H5VL_iod_server_attr_remove(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_attr_remove() */
 
 
@@ -1292,8 +1253,6 @@ H5VL_iod_server_attr_close(hg_handle_t handle)
     attr_close_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -1321,7 +1280,7 @@ H5VL_iod_server_attr_close(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_attr_close() */
 
 
@@ -1346,8 +1305,6 @@ H5VL_iod_server_group_create(hg_handle_t handle)
     group_create_in_t *input;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -1374,7 +1331,7 @@ H5VL_iod_server_group_create(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_group_create() */
 
 
@@ -1399,8 +1356,6 @@ H5VL_iod_server_group_open(hg_handle_t handle)
     group_open_in_t *input;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -1427,7 +1382,7 @@ H5VL_iod_server_group_open(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_group_open() */
 
 
@@ -1452,8 +1407,6 @@ H5VL_iod_server_group_close(hg_handle_t handle)
     group_close_in_t *input;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -1479,7 +1432,7 @@ H5VL_iod_server_group_close(hg_handle_t handle)
                                       0, NULL, H5VL_iod_server_group_close_cb, op_data, NULL))
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_group_close() */
 
 
@@ -1504,8 +1457,6 @@ H5VL_iod_server_dset_create(hg_handle_t handle)
     dset_create_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -1533,7 +1484,7 @@ H5VL_iod_server_dset_create(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_dset_create() */
 
 
@@ -1558,8 +1509,6 @@ H5VL_iod_server_dset_open(hg_handle_t handle)
     dset_open_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -1587,7 +1536,7 @@ H5VL_iod_server_dset_open(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_dset_open() */
 
 
@@ -1612,8 +1561,6 @@ H5VL_iod_server_dset_read(hg_handle_t handle)
     dset_io_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -1641,7 +1588,7 @@ H5VL_iod_server_dset_read(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_dset_read() */
 
 
@@ -1666,8 +1613,6 @@ H5VL_iod_server_dset_get_vl_size(hg_handle_t handle)
     dset_io_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -1695,7 +1640,7 @@ H5VL_iod_server_dset_get_vl_size(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_dset_get_vl_size() */
 
 
@@ -1720,8 +1665,6 @@ H5VL_iod_server_dset_write(hg_handle_t handle)
     dset_io_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -1749,7 +1692,7 @@ H5VL_iod_server_dset_write(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_dset_write() */
 
 
@@ -1774,8 +1717,6 @@ H5VL_iod_server_dset_set_extent(hg_handle_t handle)
     dset_set_extent_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -1803,7 +1744,7 @@ H5VL_iod_server_dset_set_extent(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_dset_set_extent() */
 
 
@@ -1828,8 +1769,6 @@ H5VL_iod_server_dset_close(hg_handle_t handle)
     dset_close_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -1857,7 +1796,7 @@ H5VL_iod_server_dset_close(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_dset_close() */
 
 #ifdef H5_HAVE_INDEXING
@@ -1883,8 +1822,6 @@ H5VL_iod_server_dset_set_index_info(hg_handle_t handle)
     dset_set_index_info_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -1912,7 +1849,7 @@ H5VL_iod_server_dset_set_index_info(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_dset_set_index_info() */
 
 
@@ -1937,8 +1874,6 @@ H5VL_iod_server_dset_get_index_info(hg_handle_t handle)
     dset_get_index_info_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -1966,7 +1901,7 @@ H5VL_iod_server_dset_get_index_info(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_dset_get_index_info() */
 
 
@@ -1991,8 +1926,6 @@ H5VL_iod_server_dset_remove_index_info(hg_handle_t handle)
     dset_rm_index_info_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -2020,7 +1953,7 @@ H5VL_iod_server_dset_remove_index_info(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_dset_remove_index_info() */
 #endif
 
@@ -2046,8 +1979,6 @@ H5VL_iod_server_dtype_commit(hg_handle_t handle)
     dtype_commit_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -2075,7 +2006,7 @@ H5VL_iod_server_dtype_commit(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_dtype_commit() */
 
 
@@ -2100,8 +2031,6 @@ H5VL_iod_server_dtype_open(hg_handle_t handle)
     dtype_open_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -2129,7 +2058,7 @@ H5VL_iod_server_dtype_open(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_dtype_open() */
 
 
@@ -2154,8 +2083,6 @@ H5VL_iod_server_dtype_close(hg_handle_t handle)
     dtype_close_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -2183,7 +2110,7 @@ H5VL_iod_server_dtype_close(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_dtype_close() */
 
 
@@ -2208,8 +2135,6 @@ H5VL_iod_server_link_create(hg_handle_t handle)
     link_create_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -2237,7 +2162,7 @@ H5VL_iod_server_link_create(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_link_create() */
 
 
@@ -2262,8 +2187,6 @@ H5VL_iod_server_link_move(hg_handle_t handle)
     link_move_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -2291,7 +2214,7 @@ H5VL_iod_server_link_move(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_link_move() */
 
 
@@ -2315,8 +2238,6 @@ H5VL_iod_server_link_iterate(hg_handle_t UNUSED handle)
     //op_data_t *op_data = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
-
 #if 0
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
@@ -2340,8 +2261,8 @@ H5VL_iod_server_link_iterate(hg_handle_t UNUSED handle)
     op_data->input = (void *)input;
 #endif
 
-    //done:
-    FUNC_LEAVE_NOAPI(ret_value)
+done:
+    return ret_value;
 } /* end H5VL_iod_server_link_iterate() */
 
 
@@ -2366,8 +2287,6 @@ H5VL_iod_server_link_exists(hg_handle_t handle)
     link_op_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -2395,7 +2314,7 @@ H5VL_iod_server_link_exists(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_link_exists() */
 
 
@@ -2420,8 +2339,6 @@ H5VL_iod_server_link_get_info(hg_handle_t handle)
     link_op_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -2449,7 +2366,7 @@ H5VL_iod_server_link_get_info(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_link_get_info() */
 
 
@@ -2474,8 +2391,6 @@ H5VL_iod_server_link_get_val(hg_handle_t handle)
     link_get_val_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -2503,7 +2418,7 @@ H5VL_iod_server_link_get_val(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_link_get_val() */
 
 
@@ -2528,8 +2443,6 @@ H5VL_iod_server_link_remove(hg_handle_t handle)
     link_op_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -2557,7 +2470,7 @@ H5VL_iod_server_link_remove(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_link_remove() */
 
 
@@ -2582,8 +2495,6 @@ H5VL_iod_server_object_open_by_token(hg_handle_t handle)
     object_token_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -2611,7 +2522,7 @@ H5VL_iod_server_object_open_by_token(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_object_open_by_token() */
 
 
@@ -2636,8 +2547,6 @@ H5VL_iod_server_object_open(hg_handle_t handle)
     object_op_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -2665,7 +2574,7 @@ H5VL_iod_server_object_open(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_object_open() */
 
 
@@ -2690,8 +2599,6 @@ H5VL_iod_server_object_copy(hg_handle_t handle)
     object_copy_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -2719,7 +2626,7 @@ H5VL_iod_server_object_copy(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_object_copy() */
 
 
@@ -2743,10 +2650,8 @@ H5VL_iod_server_object_visit(hg_handle_t UNUSED handle)
     //op_data_t *op_data = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
-
-        //done:
-    FUNC_LEAVE_NOAPI(ret_value)
+done:
+    return ret_value;
 } /* end H5VL_iod_server_object_visit() */
 
 
@@ -2771,8 +2676,6 @@ H5VL_iod_server_object_exists(hg_handle_t handle)
     object_op_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -2800,7 +2703,7 @@ H5VL_iod_server_object_exists(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_object_exists() */
 
 
@@ -2825,8 +2728,6 @@ H5VL_iod_server_object_set_comment(hg_handle_t handle)
     object_set_comment_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -2854,7 +2755,7 @@ H5VL_iod_server_object_set_comment(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_object_set_comment() */
 
 
@@ -2879,8 +2780,6 @@ H5VL_iod_server_object_get_comment(hg_handle_t handle)
     object_get_comment_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -2908,7 +2807,7 @@ H5VL_iod_server_object_get_comment(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_object_get_comment() */
 
 
@@ -2933,8 +2832,6 @@ H5VL_iod_server_object_get_info(hg_handle_t handle)
     object_op_in_t *input = NULL;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -2962,7 +2859,7 @@ H5VL_iod_server_object_get_info(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_object_get_info() */
 
 
@@ -2987,8 +2884,6 @@ H5VL_iod_server_map_create(hg_handle_t handle)
     map_create_in_t *input;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -3015,7 +2910,7 @@ H5VL_iod_server_map_create(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_map_create() */
 
 
@@ -3040,8 +2935,6 @@ H5VL_iod_server_map_open(hg_handle_t handle)
     map_open_in_t *input;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -3068,7 +2961,7 @@ H5VL_iod_server_map_open(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_map_open() */
 
 
@@ -3093,8 +2986,6 @@ H5VL_iod_server_map_set(hg_handle_t handle)
     map_set_in_t *input;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -3121,7 +3012,7 @@ H5VL_iod_server_map_set(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_map_set() */
 
 
@@ -3146,8 +3037,6 @@ H5VL_iod_server_map_get(hg_handle_t handle)
     map_get_in_t *input;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -3174,7 +3063,7 @@ H5VL_iod_server_map_get(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_map_get() */
 
 
@@ -3199,8 +3088,6 @@ H5VL_iod_server_map_get_count(hg_handle_t handle)
     map_get_count_in_t *input;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -3227,7 +3114,7 @@ H5VL_iod_server_map_get_count(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_map_get_count() */
 
 
@@ -3252,8 +3139,6 @@ H5VL_iod_server_map_exists(hg_handle_t handle)
     map_op_in_t *input;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -3280,7 +3165,7 @@ H5VL_iod_server_map_exists(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_map_exists() */
 
 
@@ -3305,8 +3190,6 @@ H5VL_iod_server_map_delete(hg_handle_t handle)
     map_op_in_t *input;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -3333,7 +3216,7 @@ H5VL_iod_server_map_delete(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_map_delete() */
 
 
@@ -3358,8 +3241,6 @@ H5VL_iod_server_map_close(hg_handle_t handle)
     map_close_in_t *input;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -3386,7 +3267,7 @@ H5VL_iod_server_map_close(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_map_close() */
 
 
@@ -3411,8 +3292,6 @@ H5VL_iod_server_rcxt_acquire(hg_handle_t handle)
     rc_acquire_in_t *input;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -3439,7 +3318,7 @@ H5VL_iod_server_rcxt_acquire(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_rcxt_acquire() */
 
 
@@ -3464,8 +3343,6 @@ H5VL_iod_server_rcxt_release(hg_handle_t handle)
     rc_release_in_t *input;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -3492,7 +3369,7 @@ H5VL_iod_server_rcxt_release(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_rcxt_release() */
 
 
@@ -3517,8 +3394,6 @@ H5VL_iod_server_rcxt_persist(hg_handle_t handle)
     rc_persist_in_t *input;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -3545,7 +3420,7 @@ H5VL_iod_server_rcxt_persist(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_rcxt_persist() */
 
 
@@ -3570,8 +3445,6 @@ H5VL_iod_server_rcxt_snapshot(hg_handle_t handle)
     rc_snapshot_in_t *input;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -3598,7 +3471,7 @@ H5VL_iod_server_rcxt_snapshot(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_rcxt_snapshot() */
 
 
@@ -3623,8 +3496,6 @@ H5VL_iod_server_trans_start(hg_handle_t handle)
     tr_start_in_t *input;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -3651,7 +3522,7 @@ H5VL_iod_server_trans_start(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_trans_start() */
 
 
@@ -3676,8 +3547,6 @@ H5VL_iod_server_trans_finish(hg_handle_t handle)
     tr_finish_in_t *input;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -3704,7 +3573,7 @@ H5VL_iod_server_trans_finish(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_trans_finish() */
 
 
@@ -3729,8 +3598,6 @@ H5VL_iod_server_trans_set_dependency(hg_handle_t handle)
     tr_set_depend_in_t *input;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -3757,7 +3624,7 @@ H5VL_iod_server_trans_set_dependency(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_trans_set_dependency() */
 
 
@@ -3782,8 +3649,6 @@ H5VL_iod_server_trans_skip(hg_handle_t handle)
     tr_skip_in_t *input;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -3810,7 +3675,7 @@ H5VL_iod_server_trans_skip(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_trans_skip() */
 
 
@@ -3835,8 +3700,6 @@ H5VL_iod_server_trans_abort(hg_handle_t handle)
     tr_abort_in_t *input;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -3863,7 +3726,7 @@ H5VL_iod_server_trans_abort(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_trans_abort() */
 
 
@@ -3888,8 +3751,6 @@ H5VL_iod_server_prefetch(hg_handle_t handle)
     prefetch_in_t *input;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -3916,7 +3777,7 @@ H5VL_iod_server_prefetch(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_prefetch() */
 
 
@@ -3941,8 +3802,6 @@ H5VL_iod_server_evict(hg_handle_t handle)
     evict_in_t *input;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -3969,7 +3828,7 @@ H5VL_iod_server_evict(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_evict() */
 
 
@@ -3994,8 +3853,6 @@ H5VL_iod_server_view_create(hg_handle_t handle)
     view_create_in_t *input;
     int ret_value = HG_SUCCESS;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(NULL == (op_data = (op_data_t *)H5MM_malloc(sizeof(op_data_t))))
 	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate axe op_data struct");
 
@@ -4022,7 +3879,7 @@ H5VL_iod_server_view_create(hg_handle_t handle)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, HG_FAIL, "can't insert task into async engine");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_server_view_create() */
 
 #endif /* H5_HAVE_EFF */
diff --git a/src/H5VLiod_server.h b/src/H5VLiod_server.h
index b44f528..683f793 100644
--- a/src/H5VLiod_server.h
+++ b/src/H5VLiod_server.h
@@ -45,6 +45,18 @@
 #define H5VL_IOD_IDX_PLUGIN_ID       "index_plugin_id"
 #define H5VL_IOD_IDX_PLUGIN_MD       "index_plugin_metadata"
 
+#define HGOTO_ERROR2(maj, min, ret_val, string) {			      \
+   fprintf(stderr, "%s\n", string);                                           \
+   HGOTO_DONE2(ret_val)						              \
+}
+
+#define HDONE_ERROR2(maj, min, ret_val, string) {			      \
+   fprintf(stderr, "%s\n", string);                                           \
+   ret_value = ret_val;                                                       \
+}
+
+#define HGOTO_DONE2(ret_val) {ret_value = ret_val; goto done;}
+
 /* Enum for metadata types stored in MD KV for HDF5->IOD objects */
 typedef enum H5VL_iod_metadata_t {
     H5VL_IOD_PLIST,             /*type ID for property lists     	    */
diff --git a/src/H5VLiod_trans.c b/src/H5VLiod_trans.c
index 4cab373..9daf990 100644
--- a/src/H5VLiod_trans.c
+++ b/src/H5VLiod_trans.c
@@ -62,8 +62,6 @@ H5VL_iod_server_rcxt_acquire_cb(AXE_engine_t UNUSED axe_engine,
     H5RC_request_t acquire_req;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(H5P_DEFAULT == input->rcapl_id)
         input->rcapl_id = H5Pcopy(H5P_RC_ACQUIRE_DEFAULT);
     rcapl_id = input->rcapl_id;
@@ -184,7 +182,6 @@ done:
     input = (rc_acquire_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_rcxt_acquire_cb() */
 
 
@@ -212,8 +209,6 @@ H5VL_iod_server_rcxt_release_cb(AXE_engine_t UNUSED axe_engine,
     iod_handle_t coh = input->coh; /* the container handle */
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Release Read Context %"PRIu64"\n", input->c_version);
 #endif
@@ -228,7 +223,6 @@ done:
     input = (rc_release_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_rcxt_release_cb() */
 
 
@@ -262,8 +256,6 @@ H5VL_iod_server_rcxt_persist_cb(AXE_engine_t UNUSED axe_engine,
     iod_hint_list_t *chint = NULL;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Persist Read Context %"PRIu64"\n", tid);
 #endif
@@ -339,7 +331,6 @@ done:
     input = (rc_persist_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_rcxt_persist_cb() */
 
 
@@ -368,8 +359,6 @@ H5VL_iod_server_rcxt_snapshot_cb(AXE_engine_t UNUSED axe_engine,
     iod_trans_id_t tid = input->c_version;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Snapshot %s with Read Context %"PRIu64"\n", input->snapshot_name, input->c_version);
 #endif
@@ -385,7 +374,6 @@ done:
     input = (rc_snapshot_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_rcxt_snapshot_cb() */
 
 
@@ -416,8 +404,6 @@ H5VL_iod_server_trans_start_cb(AXE_engine_t UNUSED axe_engine,
     unsigned num_peers; /* the number of peers starting this transaction */
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Transaction Start %"PRIu64"\n", input->trans_num);
 #endif
@@ -443,7 +429,6 @@ done:
     input = (tr_start_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_trans_start_cb() */
 
 
@@ -482,8 +467,6 @@ H5VL_iod_server_trans_finish_cb(AXE_engine_t UNUSED axe_engine,
     int step = 0;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Transaction Finish %"PRIu64"\n", trans_num);
 #endif
@@ -494,7 +477,7 @@ H5VL_iod_server_trans_finish_cb(AXE_engine_t UNUSED axe_engine,
 
     ret = iod_obj_open_write(coh, oidkv_id, trans_num, NULL, &oidkv_oh, NULL);
     if(ret != 0)
-        HGOTO_ERROR_IOD(ret, FAIL, "can't open oid KV");
+        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't open oid KV");
 
     step ++;
 
@@ -557,7 +540,6 @@ done:
     input = (tr_finish_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_trans_finish_cb() */
 
 
@@ -586,8 +568,6 @@ H5VL_iod_server_trans_set_dependency_cb(AXE_engine_t UNUSED axe_engine,
     iod_trans_depend_desc_t depends;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Transaction Set_Dependency %"PRIu64" on %"PRIu64"\n", 
             input->child_trans_num, input->parent_trans_num);
@@ -609,7 +589,6 @@ done:
     input = (tr_set_depend_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_trans_set_dependency_cb() */
 
 
@@ -640,8 +619,6 @@ H5VL_iod_server_trans_skip_cb(AXE_engine_t UNUSED axe_engine,
     iod_trans_range_desc_t skip_ranges;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Transaction Skip %"PRIu64" starting at %"PRIu64"\n", count, start_trans_num);
 #endif
@@ -662,7 +639,6 @@ done:
     input = (tr_skip_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_trans_skip_cb() */
 
 
@@ -692,8 +668,6 @@ H5VL_iod_server_trans_abort_cb(AXE_engine_t UNUSED axe_engine,
     iod_ret_t ret;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Aborting Transaction %"PRIu64"\n", input->trans_num);
 #endif
@@ -717,7 +691,6 @@ done:
     input = (tr_abort_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_trans_abort_cb() */
 
 
@@ -752,8 +725,6 @@ H5VL_iod_server_prefetch_cb(AXE_engine_t UNUSED axe_engine,
     iod_ret_t ret;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG
     fprintf(stderr, "Prefetch Object (OID %"PRIx64" OH %"PRIu64") at Version %"PRIu64"\n", 
             iod_id, iod_oh.rd_oh.cookie, tid);
@@ -779,7 +750,6 @@ done:
     input = (prefetch_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_prefetch_cb() */
 
 
@@ -814,8 +784,6 @@ H5VL_iod_server_evict_cb(AXE_engine_t UNUSED axe_engine,
     iod_ret_t ret;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(replica_id) {
         fprintf(stderr, "Evict Object (OID %"PRIx64" OH %"PRIu64") replica tag %"PRIx64"\n", 
                 iod_id, iod_oh.rd_oh.cookie, replica_id);
@@ -843,7 +811,6 @@ done:
     input = (evict_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_evict_cb() */
 
 #if H5_HAVE_IOD_CORRUPT_TOOL
diff --git a/src/H5VLiod_util.c b/src/H5VLiod_util.c
index 35502d8..01646ed 100644
--- a/src/H5VLiod_util.c
+++ b/src/H5VLiod_util.c
@@ -66,8 +66,6 @@ H5VL_iod_server_traverse(iod_handle_t coh, iod_obj_id_t loc_id, iod_handles_t lo
     iod_obj_id_t cur_id;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* Creating intermediate groups is not supported for now */
     assert(FALSE == create_interm_grps);
 
@@ -170,7 +168,7 @@ H5VL_iod_server_traverse(iod_handle_t coh, iod_obj_id_t loc_id, iod_handles_t lo
     (*iod_oh).wr_oh.cookie = cur_oh.wr_oh.cookie;
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 }
 
 
@@ -203,8 +201,6 @@ H5VL_iod_server_open_path(iod_handle_t coh, iod_obj_id_t loc_id, iod_handles_t l
     iod_obj_id_t cur_id;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     cur_oh.rd_oh.cookie = loc_handle.rd_oh.cookie;
     cur_oh.wr_oh.cookie = loc_handle.wr_oh.cookie;
     cur_id = loc_id;
@@ -291,7 +287,7 @@ H5VL_iod_server_open_path(iod_handle_t coh, iod_obj_id_t loc_id, iod_handles_t l
     (*iod_oh).wr_oh.cookie = IOD_OH_UNDEFINED;
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 }
 
 
@@ -315,8 +311,6 @@ H5VL_iod_get_file_desc(hid_t space_id, hssize_t *count, iod_hyperslab_t *hslabs)
     int ndims = 0, i;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* get the rank of this dataspace */
     if((ndims = H5Sget_simple_extent_ndims(space_id)) < 0)
         HGOTO_ERROR2(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get dataspace dimesnsion");
@@ -325,7 +319,7 @@ H5VL_iod_get_file_desc(hid_t space_id, hssize_t *count, iod_hyperslab_t *hslabs)
     case H5S_SEL_NONE:
         /* nothing selected */
         num_descriptors = 0;
-        HGOTO_DONE(SUCCEED);
+        HGOTO_DONE2(SUCCEED);
     case H5S_SEL_ALL:
         /* The entire dataspace is selected, 1 large iod hyperslab is needed */
         num_descriptors = 1;
@@ -355,7 +349,7 @@ H5VL_iod_get_file_desc(hid_t space_id, hssize_t *count, iod_hyperslab_t *hslabs)
                 hsize_t *points = NULL;
                 size_t point_count = 0;
 
-                point_count = ndims * num_descriptors * sizeof(hsize_t);
+                point_count = (hsize_t)num_descriptors * (unsigned int)ndims * sizeof(hsize_t);
 
                 if(NULL == (points = (hsize_t *)malloc(point_count)))
                     HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate array for points coords");
@@ -411,7 +405,7 @@ H5VL_iod_get_file_desc(hid_t space_id, hssize_t *count, iod_hyperslab_t *hslabs)
                     hsize_t *blocks = NULL;
                     size_t block_count = 0;
 
-                    block_count = ndims * (size_t)num_descriptors * sizeof(hsize_t) * 2;
+                    block_count = (unsigned int)ndims * (hsize_t)num_descriptors * sizeof(hsize_t) * 2;
 
                     if(NULL == (blocks = (hsize_t *)malloc(block_count)))
                         HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate array for points coords");
@@ -450,7 +444,7 @@ H5VL_iod_get_file_desc(hid_t space_id, hssize_t *count, iod_hyperslab_t *hslabs)
     *count = num_descriptors;
 
  done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
         }
 
 
@@ -475,8 +469,6 @@ H5VL_iod_insert_plist(iod_handle_t oh, iod_trans_id_t tid, hid_t plist_id,
     size_t buf_size;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* insert group creation properties in Metadata KV */
     key = strdup(H5VL_IOD_KEY_OBJ_CPL);
 
@@ -522,7 +514,7 @@ done:
         value = NULL;
     }
 
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 }
 
 
@@ -545,8 +537,6 @@ H5VL_iod_insert_link_count(iod_handle_t oh, iod_trans_id_t tid, uint64_t count,
     iod_kv_t kv;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     key = strdup(H5VL_IOD_KEY_OBJ_LINK_COUNT);
 
     kv.key = (void *)key;
@@ -577,7 +567,7 @@ done:
         free(key); 
         key = NULL;
     }
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 }
 
 
@@ -600,8 +590,6 @@ H5VL_iod_insert_object_type(iod_handle_t oh, iod_trans_id_t tid, H5I_type_t obj_
     iod_kv_t kv;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     key = strdup(H5VL_IOD_KEY_OBJ_TYPE);
 
     kv.key = (void *)key;
@@ -632,7 +620,7 @@ done:
         free(key); 
         key = NULL;
     }
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 }
 
 
@@ -657,8 +645,6 @@ H5VL_iod_insert_datatype(iod_handle_t oh, iod_trans_id_t tid, hid_t type_id,
     size_t buf_size;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* insert group creation properties in Metadata KV */
     key = strdup(H5VL_IOD_KEY_OBJ_DATATYPE);
 
@@ -704,7 +690,7 @@ done:
         value = NULL;
     }
 
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 }
 
 
@@ -729,8 +715,6 @@ H5VL_iod_insert_datatype_with_key(iod_handle_t oh, iod_trans_id_t tid, hid_t typ
     size_t buf_size;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* determine the buffer size needed to store the encoded type */ 
     if(H5Tencode(type_id,  NULL, &buf_size) < 0)
         HGOTO_ERROR2(H5E_SYM, H5E_CANTENCODE, FAIL, "failed to encode type");
@@ -769,7 +753,7 @@ done:
         value = NULL;
     }
 
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 }
 
 
@@ -794,8 +778,6 @@ H5VL_iod_insert_dataspace(iod_handle_t oh, iod_trans_id_t tid, hid_t space_id,
     size_t buf_size;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* insert group creation properties in Metadata KV */
     key = strdup(H5VL_IOD_KEY_OBJ_DATASPACE);
 
@@ -841,7 +823,7 @@ done:
         value = NULL;
     }
 
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 }
 
 
@@ -867,8 +849,6 @@ H5VL_iod_insert_new_link(iod_handle_t oh, iod_trans_id_t tid, const char *link_n
     size_t value_len;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     switch(link_type) {
         case H5L_TYPE_HARD:
             {
@@ -929,7 +909,7 @@ done:
     if(value)
         free(value);
 
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 }
 
 
@@ -954,8 +934,6 @@ H5VL_iod_get_metadata(iod_handle_t oh, iod_trans_id_t tid, H5VL_iod_metadata_t m
     iod_checksum_t *iod_cs = NULL;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(cs_scope & H5_CHECKSUM_IOD) {
         iod_cs = (iod_checksum_t *)malloc(sizeof(iod_checksum_t) * 2);
     }
@@ -971,7 +949,7 @@ H5VL_iod_get_metadata(iod_handle_t oh, iod_trans_id_t tid, H5VL_iod_metadata_t m
             if(NULL == (value = malloc((size_t)val_size)))
                 HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate value buffer");
 
-            if(iod_kv_get_value(oh, tid, key, key_size, value, &val_size, iod_cs, event) < 0)
+            if(iod_kv_get_value(oh, tid, key, key_size, (char *)value, &val_size, iod_cs, event) < 0)
                 HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "lookup failed");
 
             if((plist_id = H5Pdecode(value)) < 0)
@@ -985,7 +963,7 @@ H5VL_iod_get_metadata(iod_handle_t oh, iod_trans_id_t tid, H5VL_iod_metadata_t m
         if(NULL == (value = malloc((size_t)val_size)))
             HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate value buffer");
 
-        if(iod_kv_get_value(oh, tid, key, key_size, value, &val_size, iod_cs, event) < 0)
+        if(iod_kv_get_value(oh, tid, key, key_size, (char *)value, &val_size, iod_cs, event) < 0)
             HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "link_count lookup failed");
 
         memcpy(ret, value, val_size);
@@ -1000,7 +978,7 @@ H5VL_iod_get_metadata(iod_handle_t oh, iod_trans_id_t tid, H5VL_iod_metadata_t m
             if(NULL == (value = malloc((size_t)val_size)))
                 HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate value buffer");
 
-            if(iod_kv_get_value(oh, tid, key, key_size, value, &val_size, iod_cs, event) < 0)
+            if(iod_kv_get_value(oh, tid, key, key_size, (char *)value, &val_size, iod_cs, event) < 0)
                 HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "lookup failed");
 
             if((type_id = H5Tdecode(value)) < 0)
@@ -1019,7 +997,7 @@ H5VL_iod_get_metadata(iod_handle_t oh, iod_trans_id_t tid, H5VL_iod_metadata_t m
             if(NULL == (value = malloc((size_t)val_size)))
                 HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate value buffer");
 
-            if(iod_kv_get_value(oh, tid, key, key_size, value, &val_size, iod_cs, event) < 0)
+            if(iod_kv_get_value(oh, tid, key, key_size, (char *)value, &val_size, iod_cs, event) < 0)
                 HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "lookup failed");
 
             if((space_id = H5Sdecode(value)) < 0)
@@ -1033,7 +1011,7 @@ H5VL_iod_get_metadata(iod_handle_t oh, iod_trans_id_t tid, H5VL_iod_metadata_t m
         if(NULL == (value = malloc((size_t)val_size)))
             HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate value buffer");
 
-        if(iod_kv_get_value(oh, tid, key, key_size, value, &val_size, iod_cs, event) < 0)
+        if(iod_kv_get_value(oh, tid, key, key_size, (char *)value, &val_size, iod_cs, event) < 0)
             HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "link_count lookup failed");
 
         memcpy(ret, value, val_size);
@@ -1051,7 +1029,7 @@ H5VL_iod_get_metadata(iod_handle_t oh, iod_trans_id_t tid, H5VL_iod_metadata_t m
             if(NULL == (value = malloc((size_t)val_size)))
                 HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate value buffer");
 
-            if(iod_kv_get_value(oh, tid, key, key_size, value, &val_size, iod_cs, event) < 0)
+            if(iod_kv_get_value(oh, tid, key, key_size, (char *)value, &val_size, iod_cs, event) < 0)
                 HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "lookup failed");
 
             val_ptr = (uint8_t *)value;
@@ -1103,7 +1081,7 @@ done:
         iod_cs = NULL;
     }
 
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 }
 
 
@@ -1128,8 +1106,6 @@ H5VL__iod_server_adjust_buffer(hid_t mem_type_id, hid_t dset_type_id, size_t nel
 {
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     switch(H5Tget_class(dset_type_id)) {
         case H5T_INTEGER:
         case H5T_FLOAT:
@@ -1188,7 +1164,7 @@ H5VL__iod_server_adjust_buffer(hid_t mem_type_id, hid_t dset_type_id, size_t nel
     }
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL__iod_server_adjust_buffer */
 
 
@@ -1209,8 +1185,6 @@ H5VL_iod_verify_scratch_pad(scratch_pad *sp, iod_checksum_t iod_cs)
     iod_checksum_t computed_cs = 0;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT_NOERR
-
     computed_cs = H5_checksum_crc64(sp, sizeof(scratch_pad));
 
     if(computed_cs != iod_cs) {
@@ -1219,7 +1193,7 @@ H5VL_iod_verify_scratch_pad(scratch_pad *sp, iod_checksum_t iod_cs)
         ret_value = FAIL;
     }
 
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL_iod_verify_scratch_pad() */
 
 herr_t
@@ -1229,8 +1203,6 @@ H5VL_iod_verify_kv_pair(void *key, iod_size_t key_size, void *value, iod_size_t
     iod_checksum_t cs[2];
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     cs[0] = H5_checksum_crc64(key, key_size);
     cs[1] = H5_checksum_crc64(value, val_size);
 
@@ -1243,7 +1215,7 @@ H5VL_iod_verify_kv_pair(void *key, iod_size_t key_size, void *value, iod_size_t
         HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "Corruption detected in IOD KV pair");
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* H5VL_iod_verify_kv_pair */
 
 
@@ -1265,8 +1237,6 @@ H5VL__iod_get_h5_obj_type(iod_obj_id_t oid, iod_handle_t coh, iod_trans_id_t rti
     iod_obj_type_t iod_type;
     herr_t ret_value = -1;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     iod_type = IOD_OBJID_GETTYPE(oid);
 
     if(IOD_OBJ_ARRAY == iod_type)
@@ -1306,7 +1276,7 @@ H5VL__iod_get_h5_obj_type(iod_obj_id_t oid, iod_handle_t coh, iod_trans_id_t rti
     ret_value = obj_type;
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL__iod_get_h5_obj_type() */
 
 
@@ -1329,8 +1299,6 @@ H5VL_iod_server_iterate(iod_handle_t coh, iod_obj_id_t obj_id, iod_trans_id_t rt
     herr_t ret;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     ret = (*op)(coh, obj_id, rtid, obj_type, cs_scope, op_data);
 
     /* Get the object type, if it is not a group do not check for links */
@@ -1343,7 +1311,7 @@ H5VL_iod_server_iterate(iod_handle_t coh, iod_obj_id_t obj_id, iod_trans_id_t rt
 
         ret = iod_kv_get_num(obj_oh, rtid, &num_entries, NULL);
         if(ret != 0)
-            HGOTO_ERROR_IOD(ret, FAIL, "can't get number of KV entries");
+            HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "can't get number of KV entries");
 
         if(0 != num_entries) {
             iod_kv_params_t *kvs = NULL;
@@ -1369,10 +1337,7 @@ H5VL_iod_server_iterate(iod_handle_t coh, iod_obj_id_t obj_id, iod_trans_id_t rt
 
             ret = iod_kv_list_key(obj_oh, rtid, NULL, 0, &num_entries, kvs, NULL);
             if(ret != 0)
-                HGOTO_ERROR_IOD(ret, FAIL, "can't get list of keys");
-            //ret = iod_kv_get_list(obj_oh, rtid, NULL, 0, &num_entries, kvs, NULL);
-            //if(ret != 0)
-            //HGOTO_ERROR_IOD(ret, FAIL, "can't get KV list from group KV");
+                HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "can't get list of keys");
 
             for(i=0 ; i<num_entries ; i++) {
 
@@ -1397,10 +1362,10 @@ H5VL_iod_server_iterate(iod_handle_t coh, iod_obj_id_t obj_id, iod_trans_id_t rt
 
                 /* Get the object type. */
                 if((otype = H5VL__iod_get_h5_obj_type(oid, coh, rtid, cs_scope)) < 0)
-                    HGOTO_ERROR_IOD(ret, FAIL, "can't get object type");
+                    HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "can't get object type");
 
                 if(H5VL_iod_server_iterate(coh, oid, rtid, otype, cs_scope, op, op_data) < 0)
-                    HGOTO_ERROR_IOD(ret, FAIL, "can't iterate");
+                    HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "can't iterate");
             }
 
             for(i=0 ; i<num_entries ; i++) {
@@ -1420,7 +1385,7 @@ H5VL_iod_server_iterate(iod_handle_t coh, iod_obj_id_t obj_id, iod_trans_id_t rt
 
     ret_value = ret;
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 }
 
 #if 0
@@ -1430,8 +1395,6 @@ H5VL_iod_map_type_convert(hid_t src_id, hid_t dst_id, void *buf, size_t buf_size
     H5T_class_t class;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     class = H5Tget_class(src_id);
     if(H5T_VLEN == class || (H5T_STRING == class && H5Tis_variable_str(src_id)))
         HGOTO_ERROR2(H5E_DATATYPE, H5E_CANTINIT, FAIL, "Can't convert VL or string types");
@@ -1462,7 +1425,7 @@ H5VL_iod_map_type_convert(hid_t src_id, hid_t dst_id, void *buf, size_t buf_size
         HGOTO_ERROR2(H5E_DATATYPE, H5E_CANTINIT, FAIL, "data type conversion failed")
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 }
 #endif
 #endif /* H5_HAVE_EFF */
diff --git a/src/H5VLiod_view.c b/src/H5VLiod_view.c
index 58d7e35..c3e03ee 100644
--- a/src/H5VLiod_view.c
+++ b/src/H5VLiod_view.c
@@ -52,8 +52,6 @@ H5VL__iod_view_iterate_cb(iod_handle_t coh, iod_obj_id_t obj_id, iod_trans_id_t
     H5VL_view_op_t *op_data = (H5VL_view_op_t *)_op_data;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(obj_type == H5I_DATASET) {
         hsize_t i = op_data->region_info.count;
 
@@ -71,7 +69,7 @@ H5VL__iod_view_iterate_cb(iod_handle_t coh, iod_obj_id_t obj_id, iod_trans_id_t
     }
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 }
 
 /*-------------------------------------------------------------------------
@@ -105,8 +103,6 @@ H5VL_iod_server_view_create_cb(AXE_engine_t UNUSED axe_engine,
     hsize_t i;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 #if H5_EFF_DEBUG 
     fprintf(stderr, "Start View create on OID %"PRIx64"\n", loc_id);
 #endif
@@ -205,7 +201,6 @@ done:
     input = (view_create_in_t *)H5MM_xfree(input);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_view_create_cb() */
 
 static hid_t 
@@ -224,8 +219,6 @@ H5VL__iod_get_elmt_region(iod_handle_t coh, iod_obj_id_t dset_id,
     iod_checksum_t sp_cs = 0;
     hid_t ret_value = FAIL;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* Check if VCPL has a dataspace specified; otherwise, read the entire dataset. */
     if(H5Pget_view_elmt_scope(vcpl_id, &space_id) < 0)
         HGOTO_ERROR2(H5E_PLIST, H5E_CANTGET, FAIL, "can't retrieve vcpl region scope");;
@@ -268,7 +261,7 @@ H5VL__iod_get_elmt_region(iod_handle_t coh, iod_obj_id_t dset_id,
     }
 
     if(iod_obj_close(mdkv_oh, NULL, NULL) < 0)
-        HDONE_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
+        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close iod object");
 
     nelmts = (size_t) H5Sget_select_npoints(space_id);
     elmt_size = H5Tget_size(type_id);
@@ -285,7 +278,7 @@ H5VL__iod_get_elmt_region(iod_handle_t coh, iod_obj_id_t dset_id,
         HGOTO_ERROR2(H5E_SYM, H5E_READERROR, FAIL, "can't read from array object");
 
     if(iod_obj_close(dset_oh, NULL, NULL) < 0)
-        HDONE_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
+        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close iod object");
 
     if(FAIL == (udata.space_query = H5Scopy(space_id)))
         HGOTO_ERROR2(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to copy dataspace");
@@ -308,20 +301,20 @@ H5VL__iod_get_elmt_region(iod_handle_t coh, iod_obj_id_t dset_id,
 
 done:
     if(space_id && H5Sclose(space_id) < 0)
-        HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release dataspace");
+        HDONE_ERROR2(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release dataspace");
     if(use_region_scope) {
         if(dset_space_id && H5Sclose(dset_space_id) < 0)
-            HDONE_ERROR(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release dataspace");
+            HDONE_ERROR2(H5E_DATASPACE, H5E_CANTRELEASE, FAIL, "unable to release dataspace");
     }
     if(type_id && H5Tclose(type_id) < 0)
-        HDONE_ERROR(H5E_DATATYPE, H5E_CANTRELEASE, FAIL, "unable to release datatype")
+        HDONE_ERROR2(H5E_DATATYPE, H5E_CANTRELEASE, FAIL, "unable to release datatype")
     if(dcpl_id && H5Pclose(dcpl_id) < 0)
-        HDONE_ERROR(H5E_DATATYPE, H5E_CANTRELEASE, FAIL, "unable to release property list")
+        HDONE_ERROR2(H5E_DATATYPE, H5E_CANTRELEASE, FAIL, "unable to release property list")
 
     if(buf != NULL)
         free(buf);
 
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL__iod_get_elmt_region() */
 
 static herr_t
@@ -335,8 +328,6 @@ H5VL__iod_get_token(H5O_type_t obj_type, iod_obj_id_t iod_id, iod_obj_id_t mdkv_
     size_t token_size = 0;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     token_size = sizeof(iod_obj_id_t)*3 + sizeof(H5O_type_t);
 
     switch(obj_type) {
@@ -463,7 +454,7 @@ H5VL__iod_get_token(H5O_type_t obj_type, iod_obj_id_t iod_id, iod_obj_id_t mdkv_
     }
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL__iod_get_token() */
 
 #if 0
@@ -506,16 +497,14 @@ H5VL_iod_server_get_layout_cb(AXE_engine_t UNUSED axe_engine,
     iod_layout_t layout;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     if(obj_oh.cookie == IOD_OH_UNDEFINED) {
         if (iod_obj_open_read(coh, obj_id, NULL /*hints*/, &obj_oh, NULL) < 0)
-            HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't open current group");
+            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't open current group");
         opened_locally = TRUE;
     }
 
     if(iod_obj_get_layout(obj_oh, rtid, &layout, NULL) < 0)
-        HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't get object layout");
+        HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "can't get object layout");
 
     output.ret = ret_value;
     output.layout = layout
@@ -533,10 +522,9 @@ done:
     /* close the dataset if we opened it in this routine */
     if(opened_locally) {
         if(iod_obj_close(obj_oh, NULL, NULL) < 0)
-            HDONE_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
+            HDONE_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
     }
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_get_layout_cb() */
 
 
@@ -573,8 +561,6 @@ H5VL_iod_server_view_create_cb(AXE_engine_t UNUSED axe_engine,
     H5VL_token_t *tokens = NULL;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* If the location type is a raw data object, then only 1 token is needed */
     if(loc_type == H5I_MAP || loc_type == H5I_DATASET || loc_type ==  H5I_DATATYPE)
         token_count = 1;
@@ -584,17 +570,17 @@ H5VL_iod_server_view_create_cb(AXE_engine_t UNUSED axe_engine,
     else if(loc_type == H5I_GROUP || loc_type == H5I_FILE) {
         if(iod_container_list_obj(coh, rtid, IOD_OBJ_ANY, 0, &token_count,
                                   NULL, NULL, NULL, NULL) < 0)
-            HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "failed to retrieve total number of objects in container");
+            HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "failed to retrieve total number of objects in container");
     }
 
     if(NULL == (tokens = (H5VL_token_t *)malloc(sizeof(H5VL_token_t) * token_count)))
-        HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate token structs");
+        HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate token structs");
 
     if(H5VL__iod_server_construct_view(coh, loc_id, rtid, query, &num_tokens, tokens) < 0)
-        HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "failed to construct view");
+        HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "failed to construct view");
 
     if(NULL == (output = (view_create_out_t *)H5MM_malloc(sizeof(view_create_out_t))))
-	HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate output struct for view create");
+	HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, HG_FAIL, "can't allocate output struct for view create");
 
     output->ret = ret_value;
     output->num_tokens = num_tokens;
@@ -612,7 +598,6 @@ done:
     output = (view_create_out_t *)H5MM_xfree(output);
     op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_view_create_cb() */
 
 
@@ -643,22 +628,20 @@ H5VL_iod_server_get_view_tokens_cb(AXE_engine_t UNUSED axe_engine,
     hg_bulk_request_t bulk_request; /* HG request */
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
 
     /* Create a new block handle to write the data */
     HG_Bulk_block_handle_create(buf, size, HG_BULK_READ_ONLY, &bulk_block_handle);
 
     /* Write bulk data here and wait for the data to be there  */
     if(HG_SUCCESS != HG_Bulk_write_all(dest, bulk_handle, bulk_block_handle, &bulk_request))
-        HGOTO_ERROR(H5E_SYM, H5E_READERROR, FAIL, "can't read from array object");
+        HGOTO_ERROR2(H5E_SYM, H5E_READERROR, FAIL, "can't read from array object");
     /* wait for it to complete */
     if(HG_SUCCESS != HG_Bulk_wait(bulk_request, HG_MAX_IDLE_TIME, HG_STATUS_IGNORE))
-        HGOTO_ERROR(H5E_SYM, H5E_READERROR, FAIL, "can't read from array object");
+        HGOTO_ERROR2(H5E_SYM, H5E_READERROR, FAIL, "can't read from array object");
 
     /* free block handle */
     if(HG_SUCCESS != HG_Bulk_block_handle_free(bulk_block_handle))
-        HGOTO_ERROR(H5E_SYM, H5E_READERROR, FAIL, "can't free bds block handle");
+        HGOTO_ERROR2(H5E_SYM, H5E_READERROR, FAIL, "can't free bds block handle");
 
     HG_Handler_start_output(op_data->hg_handle, output);
 
@@ -670,7 +653,6 @@ done:
     input = (object_op_in_t *)H5MM_xfree(input);
     //op_data = (op_data_t *)H5MM_xfree(op_data);
 
-    FUNC_LEAVE_NOAPI_VOID
 } /* end H5VL_iod_server_get_view_tokens_cb() */
 
 
@@ -690,20 +672,18 @@ H5VL__iod_server_construct_view(iod_handle_t coh, iod_obj_id_t loc_id, iod_trans
 {
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* get tokens for attributes that satisfy the query on the current
        location object */
     if(query_type & H5Q_TYPE_ATTR_NAME) {
         if(H5VL_iod_query_attribute(coh, rtid, loc_id, query, num_tokens, tokens) < 0)
-            HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to query dataset for selection");
+            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "unable to query dataset for selection");
     }
 
     if(loc_id & IOD_OBJ_TYPE_ARRAY) {
         /* get token for dataset and space selection for data
            elements that satisfy the query */
         if(H5VL_iod_query_selection(coh, rtid, loc_id, query, num_tokens, tokens) < 0)
-            HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to query dataset for selection");
+            HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "unable to query dataset for selection");
     }
 
     else if(loc_id & IOD_OBJ_TYPE_KV) {
@@ -713,12 +693,12 @@ H5VL__iod_server_construct_view(iod_handle_t coh, iod_obj_id_t loc_id, iod_trans
            has a link from the current location object. */
         if(query_type & H5Q_TYPE_LINK_NAME) {
             if(H5VL_iod_query_link(coh, rtid, loc_id, query, num_tokens, tokens) < 0)
-                HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to query dataset for selection");
+                HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "unable to query dataset for selection");
         }
     }
 
 done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL__iod_server_construct_view() */
 
 
@@ -747,28 +727,26 @@ H5VL__iod_query_selection(iod_handle_t coh, iod_obj_id_t obj_id,
     H5O_type_t otype;
     herr_t ret_value = SUCCEED;
 
-    FUNC_ENTER_NOAPI_NOINIT
-
     /* open the array object */
     if (iod_obj_open_read(coh, obj_id, NULL /*hints*/, &obj_oh, NULL) < 0)
-        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't open current group");
+        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't open current group");
 
     /* get scratch pad of the dataset */
     if(iod_obj_get_scratch(obj_oh, rtid, &sp, NULL, NULL) < 0)
-        HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "can't get scratch pad for object");
+        HGOTO_ERROR2(H5E_FILE, H5E_CANTINIT, FAIL, "can't get scratch pad for object");
 
     /* open the metadata scratch pad */
     if (iod_obj_open_write(coh, sp[0], NULL /*hints*/, &mdkv_oh, NULL) < 0)
-        HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "can't open scratch pad");
+        HGOTO_ERROR2(H5E_FILE, H5E_CANTINIT, FAIL, "can't open scratch pad");
 
     /* retrieve the datatype of array object */
     if(H5VL_iod_get_metadata(mdkv_oh, rtid, H5VL_IOD_DATATYPE, H5VL_IOD_KEY_OBJ_DATATYPE,
                              NULL, NULL, type_id) < 0)
-        HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "failed to retrieve datatype");
+        HGOTO_ERROR2(H5E_SYM, H5E_CANTGET, FAIL, "failed to retrieve datatype");
 
     /* close the metadata scratch pad */
     if(iod_obj_close(mdkv_oh, NULL, NULL) < 0)
-        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't close object");
+        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close object");
 
     /* get layout dataspace from the query to read from */
     layout_space = H5Qget_space(query);
@@ -779,21 +757,21 @@ H5VL__iod_query_selection(iod_handle_t coh, iod_obj_id_t obj_id,
 
     /* allocate buffer to hold data */
     if(NULL == (buf = malloc(buf_size)))
-        HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate read buffer");
+        HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate read buffer");
 
     /* read the data selection from IOD. */
     /* MSC - will need to do it in pieces, not it one shot. */
     if(H5VL__iod_server_final_io(coh, obj_oh, layout_space, type_id, 
                                  FALSE, buf, buf_size, 0, 0, rtid) < 0)
-        HGOTO_ERROR(H5E_SYM, H5E_CANTREAD, FAIL, "can't read from array object");
+        HGOTO_ERROR2(H5E_SYM, H5E_CANTREAD, FAIL, "can't read from array object");
 
     if(H5Qapply(query, buf, type_id, layout_space, H5P_DEFAULT, &queried_space) < 0)
-        HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't apply query on dataspace");
+        HGOTO_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't apply query on dataspace");
 
     if(H5Sencode(queried_space, NULL, &ds_size) < 0)
-        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTENCODE, FAIL, "can't encode dataspace");
+        HGOTO_ERROR2(H5E_DATASPACE, H5E_CANTENCODE, FAIL, "can't encode dataspace");
     if(H5Tencode(type_id, NULL, &dt_size) < 0)
-        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTENCODE, FAIL, "can't encode datatype");
+        HGOTO_ERROR2(H5E_DATATYPE, H5E_CANTENCODE, FAIL, "can't encode datatype");
 
     token_size += sizeof(iod_obj_id_t)*3 + sizeof(H5O_type_t) +
         dt_size + ds_size + sizeof(size_t)*2;
@@ -802,7 +780,7 @@ H5VL__iod_query_selection(iod_handle_t coh, iod_obj_id_t obj_id,
     tokens[u].token_size = token_size;
 
     if(NULL == (tokens[u].token = malloc(token_size)))
-        HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate token buffer");
+        HGOTO_ERROR2(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate token buffer");
 
     buf_ptr = (uint8_t *)tokens[u].token;
 
@@ -819,13 +797,13 @@ H5VL__iod_query_selection(iod_handle_t coh, iod_obj_id_t obj_id,
     HDmemcpy(buf_ptr, &dt_size, sizeof(size_t));
     buf_ptr += sizeof(size_t);
     if(H5Tencode(type_id, buf_ptr, &dt_size) < 0)
-        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTENCODE, FAIL, "can't encode datatype");
+        HGOTO_ERROR2(H5E_DATATYPE, H5E_CANTENCODE, FAIL, "can't encode datatype");
     buf_ptr += dt_size;
 
     HDmemcpy(buf_ptr, &ds_size, sizeof(size_t));
     buf_ptr += sizeof(size_t);
     if(H5Sencode(queried_space, buf_ptr, &ds_size) < 0)
-        HGOTO_ERROR(H5E_DATASPACE, H5E_CANTENCODE, FAIL, "can't encode dataspace");
+        HGOTO_ERROR2(H5E_DATASPACE, H5E_CANTENCODE, FAIL, "can't encode dataspace");
     buf_ptr += space_size;
 
     *num_tokens ++;
@@ -841,9 +819,9 @@ done:
         free(buf);
 
     if(obj_oh != IOD_OH_UNDEFINED && iod_obj_close(obj_oh, NULL, NULL) < 0)
-        HDONE_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
+        HDONE_ERROR2(H5E_SYM, H5E_CANTINIT, FAIL, "can't close Array object");
 
-    FUNC_LEAVE_NOAPI(ret_value)
+    return ret_value;
 } /* end H5VL__iod_query_selection() */
 #endif