Yes.  I think the old line was wrong.  It now matches what you put in the CCDNoise.applyToVar function (for an image with no flux and pure sky level).  I had written the above line, so when I noticed they did different things, I thought about it, and I convinced myself that you were right and my line was wrong.