Merge r28056 from nmap-npingchanges: Add a suggestion from Dan Farmer.
Merge r28095 from nmap-npingchanges: Add more ideas suggested by Dan Farmer