More work on the replay module.