net_utils: cleanups to reduce size of diff