Update based on cleanup made to the upstream version on OpenUCX. Signed-off-by: Nathan Hjelm <hjelmn@lanl.gov>