Rewritten handling of callback validation.