Slight restructuring of replay registration.