Moved where smoothing occurs, and added more zero-count years.

This way, we don't get weird effects from using basis interpolation.