Minor cleanup, incl. hack for operator spans and addresses for sends