Removed code that (I think) is unnecessary -- setting variables to zero when we've already zeroed out the structure.