clean up references to ::macro