Changes required by Guava deprecation of Stopwatch ctor

This supersedes #53