Two soundness bugs.

Yay...
Merge branch 'master' into wildcard

Conflicts:
	testsuite.ml
So at least this branch fixes one of the two flexbugs.