Removed unused operators/methods; typedefed all sets.

That's a preparatory step to move at least operator< to functors.