Now InvVect and NetAddr are in message::{inv,addresses} respectively.