This series includes the reorganization patch I forgot to include when
I originally submitted the patch, and also changes _add_mac_cb to
add_mac_cb. For good measure I also include a patch to rename
_add_ips_cb(), which slipped through an earlier review.