Extract original_validator handlers

This allows folks to override this behavior if desired.