Two minor bugfixes

Annual output was being reset before being output in debugging statements,
and the number of dummy metrics being returned for nonsensical parameter
combinations was not correct.  Neither of these affected validity of output
data.