Second part of NWFPE improvements.  Builds on top of patch 1464/1.

Remove unused code.  And fix a function prototype to match function.
No impact on generated code or NWFPE performance.