WYCS: yet more fixes for the new solver; currently at 39 / 84 failures, with 11 ignores.  That's almost up to where I was with the old solver ...