Change NaCl demodulator code to look more like code written in 2014 than code written in 1994.