Ongoing TimeInterval refactoring

Clean up doc and use scratch variables in a few places.