Document and cleanup new effective-single-reply code