Small amount of cleanup around timing of requests.