Add tests for the extra-constraints wildcard
Print "_" instead of "__anz" in error messages

Where "anz" is a generated name.