Tiny Clean up and remove some more references to JNF
Authored by: kappa1 2012-11-04
Parent: [r3813]
Child: [r3815]
