Fix wording in a couple comments
Use literal dicts where possible for performance
Add tests for subnet preference
Simplify subnet preference code considerably
Refactor announce test helpers
Add IPv6 peers to the subnet tests