Unify the nok setting for better optimizer chances.

Suggested by bulk88.  Also comment tweaks.