Refactoring.

I figured out that the straight-flush-p function was a bit too
complex. It kept a lot of state completely for no reason.