Replace NNames in two more files.
Some code style changes.
If 0’ing out unused functions in a few plug-ins.