Cleaned up replay separation stuff a bit.