Removed some unnecessary nil-comparisons. Also some minor style improvem...

Often, you would do the following comparison:
    someSet == nil
This is always true, as even the empty set != nil.
I simply removed those comparisons.

The few other changes should be self-explanatory.

All the tests are still working.