A couple more replay simplifications

I also caught the intermittent 'alarm' test failure, but the error output was stomped before I could check it :/.  Fixed that problem here.