Ruby 2.0 fixes.

  Use Set#add instead of Set#+
  Use Set#delete instead of Set#-