Clean up how timing is generated.