Added compatibility shim for the Set class.
Clean up whitespace.