Further work on nap duration tracking.