Merge "Simplify wait_time stats"