Fixes from review comments.  Biggest change is that we use C++11
standard library for timer-related functions.