Fixes #3161 - don't throw away arguments for validate_re