Hmm. I didn't expect a change since I hadn't added tests for the new

stuff, but fixing the bug that existed in reporting the constraint name
changes the error line.  Patch to expected output enclosed.

Stephan Szabo