Fixed version of addNAs and byeShort to reduce complexity and improve short timestep handling.