Add a peer method, elaborate desc and prints
Merge upstream and deconflict #3310 whitespace
Maybe deconflict #3310 for real?

Hmm i kinda suck at this.
Merge from an upstream deconflict

This is probably a stupid way to do it; it'd be easier to rebase but
whatevs.
Add a false positive check
Light touchup on FP checker
Deconflict #3310 and correct the description