And it looks like you can drop peer-addr and addr as well.