Merged r27162 from nmap-npingchanges: Remove some unused code
Merge r27177-180 from nmap-npingchanges: Minor typo and style fixes in -h output