Moved a couple of extra items from grlibs-stopwatch.