Fixes #378 (hopefully). Unit tests for counters to follow.

The problem was that the call to Finish() the user counters was
lost in a big merge. If I had already written the tests for the
user counters, this would probably have been catched earlier.