Move validation to existing callback.