A couple more replay simplifications
Merge pull request #84 from cgjones/simplify-replay

A couple more replay simplifications