This was ridiculous; make it less ridiculous.
Fix the obvious bits in FNPPacketMangler too
Merge branch 'constant-time-clean' into stable-1448-new