Two related changes to timing code: